diff options
Diffstat (limited to 'salt')
4 files changed, 7 insertions, 15 deletions
diff --git a/salt/gentoo_baseimage/gentoo_baseimage/files/build.sh b/salt/gentoo_baseimage/gentoo_baseimage/files/build.sh index e0f0cb1..d06e6dd 100644 --- a/salt/gentoo_baseimage/gentoo_baseimage/files/build.sh +++ b/salt/gentoo_baseimage/gentoo_baseimage/files/build.sh @@ -27,7 +27,7 @@ for image in $(docker images | awk '{print $3}'); do done echo "Building docker image" -docker build -t {{ pillar["gentoo_baseimage"]["image_name"] }}:{{ pillar["ci"]["tag"] }} . +docker build --progress plain -t {{ pillar["gentoo_baseimage"]["image_name"] }}:{{ pillar["ci"]["tag"] }} . {% if pillar["ci"]["local_build"] == False %} echo "Push docker image to the registry" diff --git a/salt/gentoo_baseimage/gentoo_baseimage/files/eselect-repo.conf b/salt/gentoo_baseimage/gentoo_baseimage/files/eselect-repo.conf new file mode 100644 index 0000000..b129b3a --- /dev/null +++ b/salt/gentoo_baseimage/gentoo_baseimage/files/eselect-repo.conf @@ -0,0 +1,4 @@ +[lisp] +location = /var/db/repos/lisp +sync-type = git +sync-uri = https://anongit.gentoo.org/git/proj/lisp.git diff --git a/salt/gentoo_baseimage/gentoo_baseimage/files/installdeps.sh b/salt/gentoo_baseimage/gentoo_baseimage/files/installdeps.sh index 6c1964f..9aaf18f 100644 --- a/salt/gentoo_baseimage/gentoo_baseimage/files/installdeps.sh +++ b/salt/gentoo_baseimage/gentoo_baseimage/files/installdeps.sh @@ -13,17 +13,4 @@ source /etc/profile eselect news read all eselect news purge etc-update --automode -5 -emerge app-portage/layman -layman -L -layman -a lisp -echo 'source "/var/lib/layman/make.conf"' >> /etc/portage/make.conf -cat >/var/lib/layman/make.conf <<EOF -ENABLED=" -/var/lib/layman/lisp" -DISABLED=" -" -PORTDIR_OVERLAY=" -\$ENABLED -\$PORTDIR_OVERLAY" -EOF exit 0 diff --git a/salt/gentoo_baseimage/gentoo_baseimage/files/make.conf b/salt/gentoo_baseimage/gentoo_baseimage/files/make.conf index a9234de..25eb0e9 100644 --- a/salt/gentoo_baseimage/gentoo_baseimage/files/make.conf +++ b/salt/gentoo_baseimage/gentoo_baseimage/files/make.conf @@ -10,9 +10,10 @@ ABI_X86="64 32" EMERGE_DEFAULT_OPTS="--quiet-build=y --with-bdeps=y --nospinner --verbose-conflicts --changed-deps-report=n --keep-going=y" FEATURES="-preserve-libs" ACCEPT_LICENSE="* -@EULA" +OPENSSH_EOL_USE_FLAGS_I_KNOW_WHAT_I_AM_DOING="yes" MAKEOPTS="-j{{ grains["num_cpus"] }}" PORTAGE_NICENESS="19" -FEATURES="-preserve-libs metadata-transfer -sandbox -network-sandbox -usersandbox" +FEATURES="protect-owned -preserve-libs metadata-transfer -sandbox -network-sandbox -usersandbox" PORTDIR="/usr/portage" DISTDIR="/usr/portage/distfiles" PKGDIR="/usr/portage/packages" |