Merge debug files into image

.gitlab-ci.yml

@@ -4,7 +4,6 @@
   stage: 'build'
   tags: ['nest']
   script:
-    - 'mkdir debug'
     - 'buildah login -u "$CI_REGISTRY_USER" -p "$CI_REGISTRY_PASSWORD" "$CI_REGISTRY"'
     - 'buildah bud --security-opt seccomp=unconfined
                    --build-arg STAGE1_TAG="${CPU}-${ROLE}"
@@ -14,12 +13,9 @@
                    -v "/usr/bin/qemu-${QEMU_ARCH}:/usr/bin/qemu-${QEMU_ARCH}:ro"
                    -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}:${PLATFORM}-${ROLE}" .'
-    - 'buildah bud --build-arg STAGE1_TAG="${CPU}-${ROLE}" -t "${CI_REGISTRY_IMAGE}/debug:${PLATFORM}-${ROLE}" -f Containerfile.debug .'
     - 'buildah push "${CI_REGISTRY_IMAGE}:${PLATFORM}-${ROLE}"'
-    - 'buildah push "${CI_REGISTRY_IMAGE}/debug:${PLATFORM}-${ROLE}"'
 
 'Build haswell-server':
   <<: *template

Containerfile

 ARG STAGE1_TAG
+FROM nest/stage1/debug:${STAGE1_TAG} AS debug
 FROM nest/stage1:${STAGE1_TAG}
 
 ARG FACTER_build=stage2
@@ -6,6 +7,9 @@ ARG FACTER_emerge_default_opts
 ARG FACTER_makeopts
 ARG PROFILE
 
+# Merge debug files into image so all hosts have them
+COPY --from=debug / /usr/lib/debug/
+
 RUN eix-sync -q
 
 # Switch to desired profile and make the base system consistent with it

Containerfile.debug

-ARG STAGE1_TAG
-FROM nest/stage1/debug:${STAGE1_TAG}
-COPY debug/ /