From 1694f0d9e0b6d65a46acff7a42c46313632a7d18 Mon Sep 17 00:00:00 2001 From: ckonstanski Date: Sun, 21 Nov 2021 20:28:13 -0700 Subject: a bit of un-bitrotting --- salt/gentoo_baseimage/gentoo_baseimage/files/Dockerfile | 4 ++-- salt/gentoo_baseimage/gentoo_baseimage/files/make.conf | 2 -- 2 files changed, 2 insertions(+), 4 deletions(-) (limited to 'salt/gentoo_baseimage') 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 +FROM gentoo/stage3 +MAINTAINER Carlos Konstanski 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" -- cgit v1.3