Switch to nest/tools/buildah; build debug image

.gitlab-ci.yml

 ---
 variables:
   JOBS: 8
-  STORAGE_DRIVER: 'vfs'
 
 default:
-  image: 'quay.io/containers/buildah'
+  image: '${CI_REGISTRY}/nest/tools/buildah:haswell'
   before_script:
-    - 'cp "$REGISTRIES_CONF" /etc/containers/registries.conf'
+    - 'buildah login --username "$CI_REGISTRY_USER" --password "$CI_REGISTRY_PASSWORD" "$CI_REGISTRY"'
 
-'Build nest/stage1:haswell-server':
+'Build haswell-server':
   stage: 'build'
   tags: ['nest']
   script:
+    - 'mkdir debug'
     - 'buildah bud --pull
-                   --creds="${CI_REGISTRY_USER}:${CI_REGISTRY_PASSWORD}"
                    --security-opt seccomp=unconfined
                    --build-arg STAGE0_TAG=haswell
                    --build-arg FACTER_build=stage1
@@ -21,6 +20,9 @@ default:
                    --build-arg FACTER_makeopts="-j${JOBS}"
                    -v "${PUPPET_CERTIFICATE}:/etc/puppetlabs/puppet/ssl/certs/ci.pem"
                    -v "${PUPPET_PRIVATE_KEY}:/etc/puppetlabs/puppet/ssl/private_keys/ci.pem"
+                   -v "${PWD}/debug:/usr/lib/debug"
                    -v /nest:/nest
                    -t "${CI_REGISTRY_IMAGE}:haswell-server" .'
-    - 'buildah push --creds="${CI_REGISTRY_USER}:${CI_REGISTRY_PASSWORD}" "${CI_REGISTRY_IMAGE}:haswell-server"'
+    - 'buildah bud --build-arg STAGE0_TAG=haswell -t "${CI_REGISTRY_IMAGE}/debug:haswell-server" -f Containerfile.debug .'
+    - 'buildah push "${CI_REGISTRY_IMAGE}:haswell-server"'
+    - 'buildah push "${CI_REGISTRY_IMAGE}/debug:haswell-server"'

Containerfile

@@ -4,6 +4,9 @@ FROM nest/stage0:${STAGE0_TAG}
 ARG FACTER_build
 ARG FACTER_emerge_default_opts
 ARG FACTER_makeopts
+
+RUN eix-sync -q
 RUN puppet agent --test --certname ci --logdir /var/log/puppet --rundir /var/run/puppet --vardir /var/lib/puppet --runtimeout 0; [ $? -eq 2 ]
+RUN rm -rf /var/db/repos
 
 CMD ["/bin/zsh"]

Containerfile.debug

+ARG STAGE0_TAG
+FROM nest/stage0/debug:${STAGE0_TAG}
+COPY debug/ /