commit: e3f8c60364bdfb7aa93a250ef4db1cc0b1dd2f5f Author: Sam James <sam <AT> gentoo <DOT> org> AuthorDate: Thu Feb 8 01:02:46 2024 +0000 Commit: John Helmert III <ajak <AT> gentoo <DOT> org> CommitDate: Thu Feb 8 03:16:38 2024 +0000 URL: https://gitweb.gentoo.org/proj/docker-images.git/commit/?id=e3f8c603
Revert "deploy.sh: add amd64-systemd-mergedusr, amd64-desktop-systemd, amd64-desktop-systemd-mergedusr" This reverts commit e2828573f7d52c72e8f1cf4370b6d33b9f7a4588. Signed-off-by: John Helmert III <ajak <AT> gentoo.org> deploy.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/deploy.sh b/deploy.sh index b619d35..71d5d90 100755 --- a/deploy.sh +++ b/deploy.sh @@ -17,14 +17,14 @@ docker push --all-tags "${ORG}/${NAME}" declare -A MANIFEST_TAGS=( [stage3:latest]="amd64-openrc;armv5tel-openrc;armv6j_hardfp-openrc;armv7a_hardfp-openrc;arm64-openrc;i686-openrc;ppc64le-openrc;rv64_lp64d-openrc;s390x" - [stage3:desktop]="amd64-desktop-openrc;amd64-desktop-systemd;amd64-desktop-systemd-mergedusr;arm64-desktop-openrc" + [stage3:desktop]="amd64-desktop-openrc;arm64-desktop-openrc" [stage3:hardened]="amd64-hardened-openrc;i686-hardened-openrc" [stage3:hardened-nomultilib]="amd64-hardened-nomultilib-openrc" [stage3:musl]="amd64-musl;armv7a_hardfp_musl-openrc;arm64-musl;i686-musl" [stage3:musl-hardened]="amd64-musl-hardened;arm64-musl-hardened;ppc64le-musl-hardened-openrc" [stage3:nomultilib]="amd64-nomultilib-openrc" [stage3:nomultilib-systemd]="amd64-nomultilib-systemd" - [stage3:systemd]="amd64-systemd;amd64-systemd-mergedusr;armv5tel-systemd;armv6j_hardfp-systemd;armv7a_hardfp-systemd;arm64-systemd;i686-systemd;ppc64le-systemd;rv64_lp64d-systemd" + [stage3:systemd]="amd64-systemd;armv5tel-systemd;armv6j_hardfp-systemd;armv7a_hardfp-systemd;arm64-systemd;i686-systemd;ppc64le-systemd;rv64_lp64d-systemd" ) # Find latest manifest