Skip to content

Commit

Permalink
🤖: Update build recipes from templates
Browse files Browse the repository at this point in the history
  • Loading branch information
SUSE Update Bot committed Sep 17, 2024
1 parent 0b1e306 commit 68208ee
Show file tree
Hide file tree
Showing 4 changed files with 8 additions and 8 deletions.
4 changes: 2 additions & 2 deletions apache-tomcat-10-java-17-image/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -22,12 +22,12 @@
#!BuildTag: opensuse/apache-tomcat:%%tomcat_minor%%-jre17
#!BuildTag: opensuse/apache-tomcat:%%tomcat_minor%%-jre17-%RELEASE%

FROM opensuse/bci/bci-micro:latest AS target
FROM registry.opensuse.org/opensuse/bci/bci-micro:latest AS target
FROM opensuse/tumbleweed:latest AS builder
COPY --from=target / /target

RUN set -euo pipefail; zypper --installroot /target --gpg-auto-import-keys -n in --no-recommends tomcat10 curl sed java-17-openjdk java-17-openjdk-headless; zypper -n clean; rm -rf /var/log/{lastlog,tallylog,zypper.log,zypp/history,YaST2}
FROM target
FROM registry.opensuse.org/opensuse/bci/bci-micro:latest
COPY --from=builder /target /
# Define labels according to https://en.opensuse.org/Building_derived_containers
# labelprefix=org.opensuse.application.apache-tomcat
Expand Down
4 changes: 2 additions & 2 deletions apache-tomcat-10-java-21-image/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -22,12 +22,12 @@
#!BuildTag: opensuse/apache-tomcat:%%tomcat_minor%%-jre21
#!BuildTag: opensuse/apache-tomcat:%%tomcat_minor%%-jre21-%RELEASE%

FROM opensuse/bci/bci-micro:latest AS target
FROM registry.opensuse.org/opensuse/bci/bci-micro:latest AS target
FROM opensuse/tumbleweed:latest AS builder
COPY --from=target / /target

RUN set -euo pipefail; zypper --installroot /target --gpg-auto-import-keys -n in --no-recommends tomcat10 curl sed java-21-openjdk java-21-openjdk-headless; zypper -n clean; rm -rf /var/log/{lastlog,tallylog,zypper.log,zypp/history,YaST2}
FROM target
FROM registry.opensuse.org/opensuse/bci/bci-micro:latest
COPY --from=builder /target /
# Define labels according to https://en.opensuse.org/Building_derived_containers
# labelprefix=org.opensuse.application.apache-tomcat
Expand Down
4 changes: 2 additions & 2 deletions apache-tomcat-10-java-22-image/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -23,12 +23,12 @@
#!BuildTag: opensuse/apache-tomcat:%%tomcat_minor%%-jre22-%RELEASE%
#!BuildTag: opensuse/apache-tomcat:latest

FROM opensuse/bci/bci-micro:latest AS target
FROM registry.opensuse.org/opensuse/bci/bci-micro:latest AS target
FROM opensuse/tumbleweed:latest AS builder
COPY --from=target / /target

RUN set -euo pipefail; zypper --installroot /target --gpg-auto-import-keys -n in --no-recommends tomcat10 curl sed java-22-openjdk java-22-openjdk-headless; zypper -n clean; rm -rf /var/log/{lastlog,tallylog,zypper.log,zypp/history,YaST2}
FROM target
FROM registry.opensuse.org/opensuse/bci/bci-micro:latest
COPY --from=builder /target /
# Define labels according to https://en.opensuse.org/Building_derived_containers
# labelprefix=org.opensuse.application.apache-tomcat
Expand Down
4 changes: 2 additions & 2 deletions apache-tomcat-9-java-17-image/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -22,12 +22,12 @@
#!BuildTag: opensuse/apache-tomcat:%%tomcat_minor%%-jre17
#!BuildTag: opensuse/apache-tomcat:%%tomcat_minor%%-jre17-%RELEASE%

FROM opensuse/bci/bci-micro:latest AS target
FROM registry.opensuse.org/opensuse/bci/bci-micro:latest AS target
FROM opensuse/tumbleweed:latest AS builder
COPY --from=target / /target

RUN set -euo pipefail; zypper --installroot /target --gpg-auto-import-keys -n in --no-recommends tomcat curl sed java-17-openjdk java-17-openjdk-headless; zypper -n clean; rm -rf /var/log/{lastlog,tallylog,zypper.log,zypp/history,YaST2}
FROM target
FROM registry.opensuse.org/opensuse/bci/bci-micro:latest
COPY --from=builder /target /
# Define labels according to https://en.opensuse.org/Building_derived_containers
# labelprefix=org.opensuse.application.apache-tomcat
Expand Down

0 comments on commit 68208ee

Please sign in to comment.