Skip to content

Commit 56b6ab4

Browse files
authored
Merge pull request #1414 from SUSE/for-deploy-5
🤖: Update build recipes for SP5
2 parents c09d456 + a531109 commit 56b6ab4

8 files changed

Lines changed: 24 additions & 4 deletions

File tree

openjdk-11-devel-image/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ LABEL com.suse.release-stage="released"
4040
# endlabelprefix
4141
LABEL io.artifacthub.package.readme-url="%SOURCEURL%/README.md"
4242

43-
RUN set -euo pipefail; zypper -n in --no-recommends java-11-openjdk-devel maven curl findutils gawk git-core procps; zypper -n clean; rm -rf /var/log/{lastlog,tallylog,zypper.log,zypp/history,YaST2}
43+
RUN set -euo pipefail; zypper -n in --no-recommends java-11-openjdk-devel maven; zypper -n clean; rm -rf /var/log/{lastlog,tallylog,zypper.log,zypp/history,YaST2}
4444
ENV JAVA_BINDIR="/usr/lib64/jvm/java-11-openjdk-11/bin"
4545
ENV JAVA_HOME="/usr/lib64/jvm/java-11-openjdk-11"
4646
ENV JAVA_ROOT="/usr/lib64/jvm/java-11-openjdk-11"

openjdk-11-devel-image/openjdk-11-devel-image.changes

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,8 @@
1+
-------------------------------------------------------------------
2+
Tue Jul 16 10:31:06 UTC 2024 - Dirk Mueller <dmueller@suse.com>
3+
4+
- Move devtools into openjdk base image
5+
16
-------------------------------------------------------------------
27
Thu Jul 11 08:17:51 UTC 2024 - Alexandre Vicenzi <alexandre.vicenzi@suse.com>
38

openjdk-11-image/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ LABEL com.suse.release-stage="released"
4040
# endlabelprefix
4141
LABEL io.artifacthub.package.readme-url="%SOURCEURL%/README.md"
4242

43-
RUN set -euo pipefail; zypper -n in --no-recommends java-11-openjdk; zypper -n clean; rm -rf /var/log/{lastlog,tallylog,zypper.log,zypp/history,YaST2}
43+
RUN set -euo pipefail; zypper -n in --no-recommends java-11-openjdk curl findutils gawk git-core procps; zypper -n clean; rm -rf /var/log/{lastlog,tallylog,zypper.log,zypp/history,YaST2}
4444
ENV JAVA_BINDIR="/usr/lib64/jvm/java-11-openjdk-11/bin"
4545
ENV JAVA_HOME="/usr/lib64/jvm/java-11-openjdk-11"
4646
ENV JAVA_ROOT="/usr/lib64/jvm/java-11-openjdk-11"

openjdk-11-image/openjdk-11-image.changes

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,8 @@
1+
-------------------------------------------------------------------
2+
Tue Jul 16 10:31:06 UTC 2024 - Dirk Mueller <dmueller@suse.com>
3+
4+
- Move devtools into openjdk base image
5+
16
-------------------------------------------------------------------
27
Thu Jul 11 08:17:51 UTC 2024 - Alexandre Vicenzi <alexandre.vicenzi@suse.com>
38

openjdk-17-devel-image/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ LABEL com.suse.release-stage="released"
4040
# endlabelprefix
4141
LABEL io.artifacthub.package.readme-url="%SOURCEURL%/README.md"
4242

43-
RUN set -euo pipefail; zypper -n in --no-recommends java-17-openjdk-devel maven curl findutils gawk git-core procps; zypper -n clean; rm -rf /var/log/{lastlog,tallylog,zypper.log,zypp/history,YaST2}
43+
RUN set -euo pipefail; zypper -n in --no-recommends java-17-openjdk-devel maven; zypper -n clean; rm -rf /var/log/{lastlog,tallylog,zypper.log,zypp/history,YaST2}
4444
ENV JAVA_BINDIR="/usr/lib64/jvm/java-17-openjdk-17/bin"
4545
ENV JAVA_HOME="/usr/lib64/jvm/java-17-openjdk-17"
4646
ENV JAVA_ROOT="/usr/lib64/jvm/java-17-openjdk-17"

openjdk-17-devel-image/openjdk-17-devel-image.changes

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,8 @@
1+
-------------------------------------------------------------------
2+
Tue Jul 16 10:31:06 UTC 2024 - Dirk Mueller <dmueller@suse.com>
3+
4+
- Move devtools into openjdk base image
5+
16
-------------------------------------------------------------------
27
Thu Jul 11 08:17:51 UTC 2024 - Alexandre Vicenzi <alexandre.vicenzi@suse.com>
38

openjdk-17-image/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ LABEL com.suse.release-stage="released"
4040
# endlabelprefix
4141
LABEL io.artifacthub.package.readme-url="%SOURCEURL%/README.md"
4242

43-
RUN set -euo pipefail; zypper -n in --no-recommends java-17-openjdk; zypper -n clean; rm -rf /var/log/{lastlog,tallylog,zypper.log,zypp/history,YaST2}
43+
RUN set -euo pipefail; zypper -n in --no-recommends java-17-openjdk curl findutils gawk git-core procps; zypper -n clean; rm -rf /var/log/{lastlog,tallylog,zypper.log,zypp/history,YaST2}
4444
ENV JAVA_BINDIR="/usr/lib64/jvm/java-17-openjdk-17/bin"
4545
ENV JAVA_HOME="/usr/lib64/jvm/java-17-openjdk-17"
4646
ENV JAVA_ROOT="/usr/lib64/jvm/java-17-openjdk-17"

openjdk-17-image/openjdk-17-image.changes

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,8 @@
1+
-------------------------------------------------------------------
2+
Tue Jul 16 10:31:06 UTC 2024 - Dirk Mueller <dmueller@suse.com>
3+
4+
- Move devtools into openjdk base image
5+
16
-------------------------------------------------------------------
27
Thu Jul 11 08:17:51 UTC 2024 - Alexandre Vicenzi <alexandre.vicenzi@suse.com>
38

0 commit comments

Comments
 (0)