Skip to content

Commit ab66e71

Browse files
author
SUSE Update Bot
committed
Test build for #3166 
1 parent ca8987b commit ab66e71

File tree

93 files changed

+1823
-1007
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

93 files changed

+1823
-1007
lines changed

‎389-ds-image/Dockerfile‎

Lines changed: 18 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -25,18 +25,25 @@ FROM opensuse/tumbleweed:latest
2525

2626
RUN set -euo pipefail; \
2727
zypper -n install --no-recommends 389-ds timezone openssl nss_synth
28-
29-
# cleanup logs and temporary files
28+
# image cleanup
3029
RUN set -euo pipefail; zypper -n clean -a; \
31-
rm -rf {/target,}/var/log/{alternatives.log,lastlog,tallylog,zypper.log,zypp/history,YaST2}; \
32-
rm -rf {/target,}/run/*; \
33-
rm -f {/target,}/etc/{shadow-,group-,passwd-,.pwd.lock}; \
34-
rm -f {/target,}/usr/lib/sysimage/rpm/.rpm.lock; \
35-
rm -f {/target,}/var/cache/ldconfig/aux-cache; \
36-
command -v zypper >/dev/null 2>&1 || rm -f /var/lib/zypp/AutoInstalled
37-
38-
# set the day of last password change to empty
39-
RUN set -euo pipefail; sed -i 's/^\([^:]*:[^:]*:\)[^:]*\(:.*\)$/\1\2/' /etc/shadow
30+
rm -vrf /var/log/alternatives.log; \
31+
rm -vrf /var/log/lastlog; \
32+
rm -vrf /var/log/tallylog; \
33+
rm -vrf /var/log/zypper.log; \
34+
rm -vrf /var/log/zypp/history; \
35+
rm -vrf /var/log/YaST2; \
36+
rm -vrf /var/lib/zypp/AnonymousUniqueId; \
37+
rm -vrf /var/cache/zypp/*; \
38+
rm -vrf /run/*; \
39+
rm -vrf /etc/shadow-; \
40+
rm -vrf /etc/group-; \
41+
rm -vrf /etc/passwd-; \
42+
rm -vrf /etc/.pwd.lock; \
43+
rm -vrf /usr/lib/sysimage/rpm/.rpm.lock; \
44+
rm -vrf /var/cache/ldconfig/aux-cache; \
45+
[ -f /var/lib/zypp/AutoInstalled ] && sed -i '1d' /var/lib/zypp/AutoInstalled; \
46+
sed -i 's/^\([^:]*:[^:]*:\)[^:]*\(:.*\)$/\1\2/' /etc/shadow
4047

4148
# Define labels according to https://en.opensuse.org/Building_derived_containers
4249
# labelprefix=org.opensuse.application.389-ds

‎alertmanager-image/Dockerfile‎

Lines changed: 20 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -27,18 +27,28 @@ COPY --from=target / /target
2727
RUN set -euo pipefail; \
2828
export PERMCTL_ALLOW_INSECURE_MODE_IF_NO_PROC=1; \
2929
zypper -n --installroot /target --gpg-auto-import-keys install --no-recommends golang-github-prometheus-alertmanager curl
30-
31-
# cleanup logs and temporary files
30+
# image cleanup
3231
RUN set -euo pipefail; zypper -n --installroot /target clean -a; \
33-
rm -rf {/target,}/var/log/{alternatives.log,lastlog,tallylog,zypper.log,zypp/history,YaST2}; \
34-
rm -rf {/target,}/run/*; \
35-
rm -f {/target,}/etc/{shadow-,group-,passwd-,.pwd.lock}; \
36-
rm -f {/target,}/usr/lib/sysimage/rpm/.rpm.lock; \
37-
rm -f {/target,}/var/cache/ldconfig/aux-cache; \
38-
command -v zypper >/dev/null 2>&1 || rm -f /var/lib/zypp/AutoInstalled
32+
rm -vrf /target/var/log/alternatives.log; \
33+
rm -vrf /target/var/log/lastlog; \
34+
rm -vrf /target/var/log/tallylog; \
35+
rm -vrf /target/var/log/zypper.log; \
36+
rm -vrf /target/var/log/zypp/history; \
37+
rm -vrf /target/var/log/YaST2; \
38+
rm -vrf /target/var/lib/zypp/AnonymousUniqueId; \
39+
rm -vrf /target/var/cache/zypp/*; \
40+
rm -vrf /target/run/*; \
41+
rm -vrf /target/etc/shadow-; \
42+
rm -vrf /target/etc/group-; \
43+
rm -vrf /target/etc/passwd-; \
44+
rm -vrf /target/etc/.pwd.lock; \
45+
rm -vrf /target/usr/lib/sysimage/rpm/.rpm.lock; \
46+
rm -vrf /target/var/cache/ldconfig/aux-cache; \
47+
rm -vrf /target/var/lib/zypp/AutoInstalled; \
48+
rm -vrf /target/usr/lib/sysimage/rpm/Index.db; \
49+
[ -f /var/lib/zypp/AutoInstalled ] && sed -i '1d' /var/lib/zypp/AutoInstalled; \
50+
sed -i 's/^\([^:]*:[^:]*:\)[^:]*\(:.*\)$/\1\2/' /target/etc/shadow
3951

40-
# set the day of last password change to empty
41-
RUN set -euo pipefail; sed -i 's/^\([^:]*:[^:]*:\)[^:]*\(:.*\)$/\1\2/' /target/etc/shadow
4252
FROM opensuse/bci/bci-micro:latest
4353
COPY --from=builder /target /
4454
# Define labels according to https://en.opensuse.org/Building_derived_containers

‎apache-tomcat-10-image/Dockerfile.openjdk17‎

Lines changed: 20 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -28,18 +28,28 @@ RUN set -euo pipefail; \
2828
export PERMCTL_ALLOW_INSECURE_MODE_IF_NO_PROC=1; \
2929
zypper -n --installroot /target --gpg-auto-import-keys install --no-recommends tomcat10 java-17-openjdk java-17-openjdk-headless; \
3030
zypper -n --installroot /target remove util-linux
31-
32-
# cleanup logs and temporary files
31+
# image cleanup
3332
RUN set -euo pipefail; zypper -n --installroot /target clean -a; \
34-
rm -rf {/target,}/var/log/{alternatives.log,lastlog,tallylog,zypper.log,zypp/history,YaST2}; \
35-
rm -rf {/target,}/run/*; \
36-
rm -f {/target,}/etc/{shadow-,group-,passwd-,.pwd.lock}; \
37-
rm -f {/target,}/usr/lib/sysimage/rpm/.rpm.lock; \
38-
rm -f {/target,}/var/cache/ldconfig/aux-cache; \
39-
command -v zypper >/dev/null 2>&1 || rm -f /var/lib/zypp/AutoInstalled
33+
rm -vrf /target/var/log/alternatives.log; \
34+
rm -vrf /target/var/log/lastlog; \
35+
rm -vrf /target/var/log/tallylog; \
36+
rm -vrf /target/var/log/zypper.log; \
37+
rm -vrf /target/var/log/zypp/history; \
38+
rm -vrf /target/var/log/YaST2; \
39+
rm -vrf /target/var/lib/zypp/AnonymousUniqueId; \
40+
rm -vrf /target/var/cache/zypp/*; \
41+
rm -vrf /target/run/*; \
42+
rm -vrf /target/etc/shadow-; \
43+
rm -vrf /target/etc/group-; \
44+
rm -vrf /target/etc/passwd-; \
45+
rm -vrf /target/etc/.pwd.lock; \
46+
rm -vrf /target/usr/lib/sysimage/rpm/.rpm.lock; \
47+
rm -vrf /target/var/cache/ldconfig/aux-cache; \
48+
rm -vrf /target/var/lib/zypp/AutoInstalled; \
49+
rm -vrf /target/usr/lib/sysimage/rpm/Index.db; \
50+
[ -f /var/lib/zypp/AutoInstalled ] && sed -i '1d' /var/lib/zypp/AutoInstalled; \
51+
sed -i 's/^\([^:]*:[^:]*:\)[^:]*\(:.*\)$/\1\2/' /target/etc/shadow
4052

41-
# set the day of last password change to empty
42-
RUN set -euo pipefail; sed -i 's/^\([^:]*:[^:]*:\)[^:]*\(:.*\)$/\1\2/' /target/etc/shadow
4353
FROM opensuse/bci/bci-micro:latest
4454
COPY --from=builder /target /
4555
# Define labels according to https://en.opensuse.org/Building_derived_containers

‎apache-tomcat-10-image/Dockerfile.openjdk21‎

Lines changed: 20 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -28,18 +28,28 @@ RUN set -euo pipefail; \
2828
export PERMCTL_ALLOW_INSECURE_MODE_IF_NO_PROC=1; \
2929
zypper -n --installroot /target --gpg-auto-import-keys install --no-recommends tomcat10 java-21-openjdk java-21-openjdk-headless; \
3030
zypper -n --installroot /target remove util-linux
31-
32-
# cleanup logs and temporary files
31+
# image cleanup
3332
RUN set -euo pipefail; zypper -n --installroot /target clean -a; \
34-
rm -rf {/target,}/var/log/{alternatives.log,lastlog,tallylog,zypper.log,zypp/history,YaST2}; \
35-
rm -rf {/target,}/run/*; \
36-
rm -f {/target,}/etc/{shadow-,group-,passwd-,.pwd.lock}; \
37-
rm -f {/target,}/usr/lib/sysimage/rpm/.rpm.lock; \
38-
rm -f {/target,}/var/cache/ldconfig/aux-cache; \
39-
command -v zypper >/dev/null 2>&1 || rm -f /var/lib/zypp/AutoInstalled
33+
rm -vrf /target/var/log/alternatives.log; \
34+
rm -vrf /target/var/log/lastlog; \
35+
rm -vrf /target/var/log/tallylog; \
36+
rm -vrf /target/var/log/zypper.log; \
37+
rm -vrf /target/var/log/zypp/history; \
38+
rm -vrf /target/var/log/YaST2; \
39+
rm -vrf /target/var/lib/zypp/AnonymousUniqueId; \
40+
rm -vrf /target/var/cache/zypp/*; \
41+
rm -vrf /target/run/*; \
42+
rm -vrf /target/etc/shadow-; \
43+
rm -vrf /target/etc/group-; \
44+
rm -vrf /target/etc/passwd-; \
45+
rm -vrf /target/etc/.pwd.lock; \
46+
rm -vrf /target/usr/lib/sysimage/rpm/.rpm.lock; \
47+
rm -vrf /target/var/cache/ldconfig/aux-cache; \
48+
rm -vrf /target/var/lib/zypp/AutoInstalled; \
49+
rm -vrf /target/usr/lib/sysimage/rpm/Index.db; \
50+
[ -f /var/lib/zypp/AutoInstalled ] && sed -i '1d' /var/lib/zypp/AutoInstalled; \
51+
sed -i 's/^\([^:]*:[^:]*:\)[^:]*\(:.*\)$/\1\2/' /target/etc/shadow
4052

41-
# set the day of last password change to empty
42-
RUN set -euo pipefail; sed -i 's/^\([^:]*:[^:]*:\)[^:]*\(:.*\)$/\1\2/' /target/etc/shadow
4353
FROM opensuse/bci/bci-micro:latest
4454
COPY --from=builder /target /
4555
# Define labels according to https://en.opensuse.org/Building_derived_containers

‎apache-tomcat-10-image/Dockerfile.openjdk25‎

Lines changed: 20 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -29,18 +29,28 @@ RUN set -euo pipefail; \
2929
export PERMCTL_ALLOW_INSECURE_MODE_IF_NO_PROC=1; \
3030
zypper -n --installroot /target --gpg-auto-import-keys install --no-recommends tomcat10 java-25-openjdk java-25-openjdk-headless; \
3131
zypper -n --installroot /target remove util-linux
32-
33-
# cleanup logs and temporary files
32+
# image cleanup
3433
RUN set -euo pipefail; zypper -n --installroot /target clean -a; \
35-
rm -rf {/target,}/var/log/{alternatives.log,lastlog,tallylog,zypper.log,zypp/history,YaST2}; \
36-
rm -rf {/target,}/run/*; \
37-
rm -f {/target,}/etc/{shadow-,group-,passwd-,.pwd.lock}; \
38-
rm -f {/target,}/usr/lib/sysimage/rpm/.rpm.lock; \
39-
rm -f {/target,}/var/cache/ldconfig/aux-cache; \
40-
command -v zypper >/dev/null 2>&1 || rm -f /var/lib/zypp/AutoInstalled
34+
rm -vrf /target/var/log/alternatives.log; \
35+
rm -vrf /target/var/log/lastlog; \
36+
rm -vrf /target/var/log/tallylog; \
37+
rm -vrf /target/var/log/zypper.log; \
38+
rm -vrf /target/var/log/zypp/history; \
39+
rm -vrf /target/var/log/YaST2; \
40+
rm -vrf /target/var/lib/zypp/AnonymousUniqueId; \
41+
rm -vrf /target/var/cache/zypp/*; \
42+
rm -vrf /target/run/*; \
43+
rm -vrf /target/etc/shadow-; \
44+
rm -vrf /target/etc/group-; \
45+
rm -vrf /target/etc/passwd-; \
46+
rm -vrf /target/etc/.pwd.lock; \
47+
rm -vrf /target/usr/lib/sysimage/rpm/.rpm.lock; \
48+
rm -vrf /target/var/cache/ldconfig/aux-cache; \
49+
rm -vrf /target/var/lib/zypp/AutoInstalled; \
50+
rm -vrf /target/usr/lib/sysimage/rpm/Index.db; \
51+
[ -f /var/lib/zypp/AutoInstalled ] && sed -i '1d' /var/lib/zypp/AutoInstalled; \
52+
sed -i 's/^\([^:]*:[^:]*:\)[^:]*\(:.*\)$/\1\2/' /target/etc/shadow
4153

42-
# set the day of last password change to empty
43-
RUN set -euo pipefail; sed -i 's/^\([^:]*:[^:]*:\)[^:]*\(:.*\)$/\1\2/' /target/etc/shadow
4454
FROM opensuse/bci/bci-micro:latest
4555
COPY --from=builder /target /
4656
# Define labels according to https://en.opensuse.org/Building_derived_containers

‎apache-tomcat-9-image/Dockerfile.openjdk17‎

Lines changed: 20 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -28,18 +28,28 @@ RUN set -euo pipefail; \
2828
export PERMCTL_ALLOW_INSECURE_MODE_IF_NO_PROC=1; \
2929
zypper -n --installroot /target --gpg-auto-import-keys install --no-recommends tomcat java-17-openjdk java-17-openjdk-headless; \
3030
zypper -n --installroot /target remove util-linux
31-
32-
# cleanup logs and temporary files
31+
# image cleanup
3332
RUN set -euo pipefail; zypper -n --installroot /target clean -a; \
34-
rm -rf {/target,}/var/log/{alternatives.log,lastlog,tallylog,zypper.log,zypp/history,YaST2}; \
35-
rm -rf {/target,}/run/*; \
36-
rm -f {/target,}/etc/{shadow-,group-,passwd-,.pwd.lock}; \
37-
rm -f {/target,}/usr/lib/sysimage/rpm/.rpm.lock; \
38-
rm -f {/target,}/var/cache/ldconfig/aux-cache; \
39-
command -v zypper >/dev/null 2>&1 || rm -f /var/lib/zypp/AutoInstalled
33+
rm -vrf /target/var/log/alternatives.log; \
34+
rm -vrf /target/var/log/lastlog; \
35+
rm -vrf /target/var/log/tallylog; \
36+
rm -vrf /target/var/log/zypper.log; \
37+
rm -vrf /target/var/log/zypp/history; \
38+
rm -vrf /target/var/log/YaST2; \
39+
rm -vrf /target/var/lib/zypp/AnonymousUniqueId; \
40+
rm -vrf /target/var/cache/zypp/*; \
41+
rm -vrf /target/run/*; \
42+
rm -vrf /target/etc/shadow-; \
43+
rm -vrf /target/etc/group-; \
44+
rm -vrf /target/etc/passwd-; \
45+
rm -vrf /target/etc/.pwd.lock; \
46+
rm -vrf /target/usr/lib/sysimage/rpm/.rpm.lock; \
47+
rm -vrf /target/var/cache/ldconfig/aux-cache; \
48+
rm -vrf /target/var/lib/zypp/AutoInstalled; \
49+
rm -vrf /target/usr/lib/sysimage/rpm/Index.db; \
50+
[ -f /var/lib/zypp/AutoInstalled ] && sed -i '1d' /var/lib/zypp/AutoInstalled; \
51+
sed -i 's/^\([^:]*:[^:]*:\)[^:]*\(:.*\)$/\1\2/' /target/etc/shadow
4052

41-
# set the day of last password change to empty
42-
RUN set -euo pipefail; sed -i 's/^\([^:]*:[^:]*:\)[^:]*\(:.*\)$/\1\2/' /target/etc/shadow
4353
FROM opensuse/bci/bci-micro:latest
4454
COPY --from=builder /target /
4555
# Define labels according to https://en.opensuse.org/Building_derived_containers

‎apache-tomcat-9-image/Dockerfile.openjdk21‎

Lines changed: 20 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -28,18 +28,28 @@ RUN set -euo pipefail; \
2828
export PERMCTL_ALLOW_INSECURE_MODE_IF_NO_PROC=1; \
2929
zypper -n --installroot /target --gpg-auto-import-keys install --no-recommends tomcat java-21-openjdk java-21-openjdk-headless; \
3030
zypper -n --installroot /target remove util-linux
31-
32-
# cleanup logs and temporary files
31+
# image cleanup
3332
RUN set -euo pipefail; zypper -n --installroot /target clean -a; \
34-
rm -rf {/target,}/var/log/{alternatives.log,lastlog,tallylog,zypper.log,zypp/history,YaST2}; \
35-
rm -rf {/target,}/run/*; \
36-
rm -f {/target,}/etc/{shadow-,group-,passwd-,.pwd.lock}; \
37-
rm -f {/target,}/usr/lib/sysimage/rpm/.rpm.lock; \
38-
rm -f {/target,}/var/cache/ldconfig/aux-cache; \
39-
command -v zypper >/dev/null 2>&1 || rm -f /var/lib/zypp/AutoInstalled
33+
rm -vrf /target/var/log/alternatives.log; \
34+
rm -vrf /target/var/log/lastlog; \
35+
rm -vrf /target/var/log/tallylog; \
36+
rm -vrf /target/var/log/zypper.log; \
37+
rm -vrf /target/var/log/zypp/history; \
38+
rm -vrf /target/var/log/YaST2; \
39+
rm -vrf /target/var/lib/zypp/AnonymousUniqueId; \
40+
rm -vrf /target/var/cache/zypp/*; \
41+
rm -vrf /target/run/*; \
42+
rm -vrf /target/etc/shadow-; \
43+
rm -vrf /target/etc/group-; \
44+
rm -vrf /target/etc/passwd-; \
45+
rm -vrf /target/etc/.pwd.lock; \
46+
rm -vrf /target/usr/lib/sysimage/rpm/.rpm.lock; \
47+
rm -vrf /target/var/cache/ldconfig/aux-cache; \
48+
rm -vrf /target/var/lib/zypp/AutoInstalled; \
49+
rm -vrf /target/usr/lib/sysimage/rpm/Index.db; \
50+
[ -f /var/lib/zypp/AutoInstalled ] && sed -i '1d' /var/lib/zypp/AutoInstalled; \
51+
sed -i 's/^\([^:]*:[^:]*:\)[^:]*\(:.*\)$/\1\2/' /target/etc/shadow
4052

41-
# set the day of last password change to empty
42-
RUN set -euo pipefail; sed -i 's/^\([^:]*:[^:]*:\)[^:]*\(:.*\)$/\1\2/' /target/etc/shadow
4353
FROM opensuse/bci/bci-micro:latest
4454
COPY --from=builder /target /
4555
# Define labels according to https://en.opensuse.org/Building_derived_containers

‎base-fips-image/Dockerfile‎

Lines changed: 18 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -24,18 +24,25 @@ FROM opensuse/tumbleweed:latest
2424

2525
RUN set -euo pipefail; \
2626
zypper -n install --no-recommends openSUSE-release openSUSE-release-appliance-docker coreutils crypto-policies-scripts
27-
28-
# cleanup logs and temporary files
27+
# image cleanup
2928
RUN set -euo pipefail; zypper -n clean -a; \
30-
rm -rf {/target,}/var/log/{alternatives.log,lastlog,tallylog,zypper.log,zypp/history,YaST2}; \
31-
rm -rf {/target,}/run/*; \
32-
rm -f {/target,}/etc/{shadow-,group-,passwd-,.pwd.lock}; \
33-
rm -f {/target,}/usr/lib/sysimage/rpm/.rpm.lock; \
34-
rm -f {/target,}/var/cache/ldconfig/aux-cache; \
35-
command -v zypper >/dev/null 2>&1 || rm -f /var/lib/zypp/AutoInstalled
36-
37-
# set the day of last password change to empty
38-
RUN set -euo pipefail; sed -i 's/^\([^:]*:[^:]*:\)[^:]*\(:.*\)$/\1\2/' /etc/shadow
29+
rm -vrf /var/log/alternatives.log; \
30+
rm -vrf /var/log/lastlog; \
31+
rm -vrf /var/log/tallylog; \
32+
rm -vrf /var/log/zypper.log; \
33+
rm -vrf /var/log/zypp/history; \
34+
rm -vrf /var/log/YaST2; \
35+
rm -vrf /var/lib/zypp/AnonymousUniqueId; \
36+
rm -vrf /var/cache/zypp/*; \
37+
rm -vrf /run/*; \
38+
rm -vrf /etc/shadow-; \
39+
rm -vrf /etc/group-; \
40+
rm -vrf /etc/passwd-; \
41+
rm -vrf /etc/.pwd.lock; \
42+
rm -vrf /usr/lib/sysimage/rpm/.rpm.lock; \
43+
rm -vrf /var/cache/ldconfig/aux-cache; \
44+
[ -f /var/lib/zypp/AutoInstalled ] && sed -i '1d' /var/lib/zypp/AutoInstalled; \
45+
sed -i 's/^\([^:]*:[^:]*:\)[^:]*\(:.*\)$/\1\2/' /etc/shadow
3946

4047
# Define labels according to https://en.opensuse.org/Building_derived_containers
4148
# labelprefix=org.opensuse.bci.base-fips

‎bci-ci-image/Dockerfile‎

Lines changed: 18 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -24,18 +24,25 @@ FROM opensuse/bci/python:latest
2424

2525
RUN set -euo pipefail; \
2626
zypper -n install --no-recommends build buildah dnf fish gcc git-core jq osc patch python3-devel python3-dnf python3-pipx python3-poetry
27-
28-
# cleanup logs and temporary files
27+
# image cleanup
2928
RUN set -euo pipefail; zypper -n clean -a; \
30-
rm -rf {/target,}/var/log/{alternatives.log,lastlog,tallylog,zypper.log,zypp/history,YaST2}; \
31-
rm -rf {/target,}/run/*; \
32-
rm -f {/target,}/etc/{shadow-,group-,passwd-,.pwd.lock}; \
33-
rm -f {/target,}/usr/lib/sysimage/rpm/.rpm.lock; \
34-
rm -f {/target,}/var/cache/ldconfig/aux-cache; \
35-
command -v zypper >/dev/null 2>&1 || rm -f /var/lib/zypp/AutoInstalled
36-
37-
# set the day of last password change to empty
38-
RUN set -euo pipefail; sed -i 's/^\([^:]*:[^:]*:\)[^:]*\(:.*\)$/\1\2/' /etc/shadow
29+
rm -vrf /var/log/alternatives.log; \
30+
rm -vrf /var/log/lastlog; \
31+
rm -vrf /var/log/tallylog; \
32+
rm -vrf /var/log/zypper.log; \
33+
rm -vrf /var/log/zypp/history; \
34+
rm -vrf /var/log/YaST2; \
35+
rm -vrf /var/lib/zypp/AnonymousUniqueId; \
36+
rm -vrf /var/cache/zypp/*; \
37+
rm -vrf /run/*; \
38+
rm -vrf /etc/shadow-; \
39+
rm -vrf /etc/group-; \
40+
rm -vrf /etc/passwd-; \
41+
rm -vrf /etc/.pwd.lock; \
42+
rm -vrf /usr/lib/sysimage/rpm/.rpm.lock; \
43+
rm -vrf /var/cache/ldconfig/aux-cache; \
44+
[ -f /var/lib/zypp/AutoInstalled ] && sed -i '1d' /var/lib/zypp/AutoInstalled; \
45+
sed -i 's/^\([^:]*:[^:]*:\)[^:]*\(:.*\)$/\1\2/' /etc/shadow
3946

4047
# Define labels according to https://en.opensuse.org/Building_derived_containers
4148
# labelprefix=org.opensuse.bci.bci-ci

‎bind-image/Dockerfile‎

Lines changed: 20 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -36,18 +36,28 @@ RUN set -euo pipefail; \
3636
cp /target//usr/libexec/bind/named.prep /target/usr/local/lib/bind/named.prep; \
3737
sed -i -e 's|logger "Warning: \$1"|echo "Warning: \$1" >\&2|' -e '/\. \$SYSCONFIG_FILE/d' /target/usr/local/lib/bind/named.prep
3838

39-
40-
# cleanup logs and temporary files
39+
# image cleanup
4140
RUN set -euo pipefail; zypper -n --installroot /target clean -a; \
42-
rm -rf {/target,}/var/log/{alternatives.log,lastlog,tallylog,zypper.log,zypp/history,YaST2}; \
43-
rm -rf {/target,}/run/*; \
44-
rm -f {/target,}/etc/{shadow-,group-,passwd-,.pwd.lock}; \
45-
rm -f {/target,}/usr/lib/sysimage/rpm/.rpm.lock; \
46-
rm -f {/target,}/var/cache/ldconfig/aux-cache; \
47-
command -v zypper >/dev/null 2>&1 || rm -f /var/lib/zypp/AutoInstalled
41+
rm -vrf /target/var/log/alternatives.log; \
42+
rm -vrf /target/var/log/lastlog; \
43+
rm -vrf /target/var/log/tallylog; \
44+
rm -vrf /target/var/log/zypper.log; \
45+
rm -vrf /target/var/log/zypp/history; \
46+
rm -vrf /target/var/log/YaST2; \
47+
rm -vrf /target/var/lib/zypp/AnonymousUniqueId; \
48+
rm -vrf /target/var/cache/zypp/*; \
49+
rm -vrf /target/run/*; \
50+
rm -vrf /target/etc/shadow-; \
51+
rm -vrf /target/etc/group-; \
52+
rm -vrf /target/etc/passwd-; \
53+
rm -vrf /target/etc/.pwd.lock; \
54+
rm -vrf /target/usr/lib/sysimage/rpm/.rpm.lock; \
55+
rm -vrf /target/var/cache/ldconfig/aux-cache; \
56+
rm -vrf /target/var/lib/zypp/AutoInstalled; \
57+
rm -vrf /target/usr/lib/sysimage/rpm/Index.db; \
58+
[ -f /var/lib/zypp/AutoInstalled ] && sed -i '1d' /var/lib/zypp/AutoInstalled; \
59+
sed -i 's/^\([^:]*:[^:]*:\)[^:]*\(:.*\)$/\1\2/' /target/etc/shadow
4860

49-
# set the day of last password change to empty
50-
RUN set -euo pipefail; sed -i 's/^\([^:]*:[^:]*:\)[^:]*\(:.*\)$/\1\2/' /target/etc/shadow
5161
FROM opensuse/bci/bci-micro:latest
5262
COPY --from=builder /target /
5363
# Define labels according to https://en.opensuse.org/Building_derived_containers

0 commit comments

Comments
 (0)