Commit e84424c6 authored by James T. Lee's avatar James T. Lee
Browse files

Let image inherit architecture

Since the image architecture will probably never be used for anything in
Nest, just let it take on whatever Gentoo sets for their builds.  Good
enough.
parent d9fb70fd
Pipeline #293 canceled with stage
in 177 minutes and 4 seconds
...@@ -14,7 +14,6 @@ default: ...@@ -14,7 +14,6 @@ default:
script: &script script: &script
- 'mkdir debug' - 'mkdir debug'
- 'buildah bud --pull --squash - 'buildah bud --pull --squash
--arch "$GENTOO_ARCH"
--security-opt seccomp=unconfined --security-opt seccomp=unconfined
--build-arg GENTOO_STAGE3_TAG="$GENTOO_ARCH" --build-arg GENTOO_STAGE3_TAG="$GENTOO_ARCH"
--build-arg EMERGE_DEFAULT_OPTS="${CI_HOST_EMERGE_DEFAULT_OPTS} --usepkg" --build-arg EMERGE_DEFAULT_OPTS="${CI_HOST_EMERGE_DEFAULT_OPTS} --usepkg"
...@@ -24,7 +23,7 @@ default: ...@@ -24,7 +23,7 @@ default:
-v "${PWD}/debug:/usr/lib/debug" -v "${PWD}/debug:/usr/lib/debug"
-v /nest:/nest -v /nest:/nest
-t "${CI_REGISTRY_IMAGE}:${CPU}" .' -t "${CI_REGISTRY_IMAGE}:${CPU}" .'
- 'buildah bud --arch "$GENTOO_ARCH" -t "${CI_REGISTRY_IMAGE}/debug:${CPU}" -f Containerfile.debug .' - 'buildah bud -t "${CI_REGISTRY_IMAGE}/debug:${CPU}" -f Containerfile.debug .'
- 'buildah push "${CI_REGISTRY_IMAGE}:${CPU}"' - 'buildah push "${CI_REGISTRY_IMAGE}:${CPU}"'
- 'buildah push "${CI_REGISTRY_IMAGE}/debug:${CPU}"' - 'buildah push "${CI_REGISTRY_IMAGE}/debug:${CPU}"'
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment