Eliminate build args moved into profile

.gitlab-ci.yml

@@ -7,22 +7,16 @@ default:
   before_script:
     - 'cp "$REGISTRIES_CONF" /etc/containers/registries.conf'
 
-'Build nest/stage0:amd64-server.haswell':
+'Build nest/stage0:haswell':
   stage: 'build'
   tags: ['nest']
   script:
     - 'buildah bud --pull
                    --creds="${CI_REGISTRY_USER}:${CI_REGISTRY_PASSWORD}"
                    --security-opt seccomp=unconfined
-                   --build-arg CFLAGS="-march=haswell -O2 -pipe -ggdb"
-                   --build-arg CXXFLAGS="-march=haswell -O2 -pipe -ggdb"
-                   --build-arg CPU_FLAGS_X86="aes avx avx2 fma3 mmx mmxext popcnt sse sse2 sse3 sse4_1 sse4_2 ssse3"
-                   --build-arg DISTDIR="/nest/portage/distfiles"
                    --build-arg EMERGE_DEFAULT_OPTS="--jobs=${JOBS} --usepkg"
-                   --build-arg FEATURES="buildpkg splitdebug"
                    --build-arg MAKEOPTS="-j${JOBS}"
-                   --build-arg PKGDIR="/nest/portage/packages/amd64-server.haswell"
-                   --build-arg PROFILE="amd64-server"
+                   --build-arg PROFILE="haswell/server"
                    -v /nest:/nest
-                   -t "${CI_REGISTRY_IMAGE}:amd64-server.haswell" .'
-    - 'buildah push --creds="${CI_REGISTRY_USER}:${CI_REGISTRY_PASSWORD}" "${CI_REGISTRY_IMAGE}:amd64-server.haswell"'
+                   -t "${CI_REGISTRY_IMAGE}:haswell" .'
+    - 'buildah push --creds="${CI_REGISTRY_USER}:${CI_REGISTRY_PASSWORD}" "${CI_REGISTRY_IMAGE}:haswell"'

Containerfile

@@ -2,14 +2,8 @@ FROM nest/overlay AS nest-overlay
 FROM nest/gentoo/portage AS gentoo-portage
 FROM nest/gentoo/stage3:amd64-systemd
 
-ARG CFLAGS
-ARG CXXFLAGS
-ARG CPU_FLAGS_X86
-ARG DISTDIR
 ARG EMERGE_DEFAULT_OPTS
-ARG FEATURES
 ARG MAKEOPTS
-ARG PKGDIR
 ARG PROFILE
 
 # Provide basic Portage configuration
@@ -21,6 +15,7 @@ COPY --from=nest-overlay / /var/db/repos/nest/
 
 # Update stage 3
 RUN eselect profile set "nest:${PROFILE}"
+RUN emerge --info
 RUN emerge -vDuN --with-bdeps=y @world
 RUN emerge --depclean
 

portage/package.use/default

-app-admin/puppet augeas shadow