diff options
| author | ckonstanski <carlos.konstanski@olo.com> | 2021-11-21 20:28:13 -0700 |
|---|---|---|
| committer | ckonstanski <carlos.konstanski@olo.com> | 2021-11-21 20:28:13 -0700 |
| commit | 1694f0d9e0b6d65a46acff7a42c46313632a7d18 (patch) | |
| tree | a4ebaaac980afdbe3e8d3e8146881c2c21b3144c /salt | |
| parent | ad819527bf8f0cc25e1c0c897020324e18395d94 (diff) | |
a bit of un-bitrotting
Diffstat (limited to 'salt')
| -rw-r--r-- | salt/gentoo_baseimage/gentoo_baseimage/files/Dockerfile | 4 | ||||
| -rw-r--r-- | salt/gentoo_baseimage/gentoo_baseimage/files/make.conf | 2 |
2 files changed, 2 insertions, 4 deletions
diff --git a/salt/gentoo_baseimage/gentoo_baseimage/files/Dockerfile b/salt/gentoo_baseimage/gentoo_baseimage/files/Dockerfile index 67c9f23..3f833dc 100644 --- a/salt/gentoo_baseimage/gentoo_baseimage/files/Dockerfile +++ b/salt/gentoo_baseimage/gentoo_baseimage/files/Dockerfile @@ -1,5 +1,5 @@ -FROM gentoo/stage3-amd64 -MAINTAINER Carlos Konstanski <carlos.konstanski@verizonwireless.com> +FROM gentoo/stage3 +MAINTAINER Carlos Konstanski <me@ckons.org> ADD docker-start.tar.xz / RUN /installdeps.sh ENTRYPOINT [ "/bin/bash" ] diff --git a/salt/gentoo_baseimage/gentoo_baseimage/files/make.conf b/salt/gentoo_baseimage/gentoo_baseimage/files/make.conf index b06fde6..a9234de 100644 --- a/salt/gentoo_baseimage/gentoo_baseimage/files/make.conf +++ b/salt/gentoo_baseimage/gentoo_baseimage/files/make.conf @@ -4,8 +4,6 @@ CXXFLAGS="${CFLAGS}" FCFLAGS="${CFLAGS}" FFLAGS="${CFLAGS}" USE="cacert -X -webstart -alsa -cups -gtk -vala -introspection" -PYTHON_TARGETS="python2_7 python3_6 python3_7 python3_8" -PYTHON_SINGLE_TARGET="python3_7" CURL_SSL="openssl" GRUB_PLATFORMS="pc" ABI_X86="64 32" |