Skip to content

Commit

Permalink
Merge pull request #657 from SUSE/for-deploy-Tumbleweed
Browse files Browse the repository at this point in the history
🤖: Update build recipes for Tumbleweed
  • Loading branch information
dirkmueller authored Sep 22, 2023
2 parents 369149a + 72cbcc5 commit bb79fbb
Show file tree
Hide file tree
Showing 9 changed files with 99 additions and 4 deletions.
8 changes: 4 additions & 4 deletions .obs/workflows.yml
Original file line number Diff line number Diff line change
Expand Up @@ -87,11 +87,11 @@ staging_build:
target_project: home:defolos:BCI:CR:Tumbleweed:Staging
- branch_package:
source_project: home:defolos:BCI:CR:Tumbleweed
source_package: openjdk-20-devel-image
source_package: openjdk-21-devel-image
target_project: home:defolos:BCI:CR:Tumbleweed:Staging
- branch_package:
source_project: home:defolos:BCI:CR:Tumbleweed
source_package: openjdk-20-image
source_package: openjdk-21-image
target_project: home:defolos:BCI:CR:Tumbleweed:Staging
- branch_package:
source_project: home:defolos:BCI:CR:Tumbleweed
Expand Down Expand Up @@ -235,10 +235,10 @@ refresh_devel_BCI:
package: openjdk-17-image
- trigger_services:
project: devel:BCI:Tumbleweed
package: openjdk-20-devel-image
package: openjdk-21-devel-image
- trigger_services:
project: devel:BCI:Tumbleweed
package: openjdk-20-image
package: openjdk-21-image
- trigger_services:
project: devel:BCI:Tumbleweed
package: php8-image
Expand Down
33 changes: 33 additions & 0 deletions openjdk-21-devel-image/Dockerfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
#!ExclusiveArch: aarch64 x86_64 ppc64le s390x
# SPDX-License-Identifier: MIT
#!BuildTag: opensuse/bci/openjdk-devel:21
#!BuildTag: opensuse/bci/openjdk-devel:21-%RELEASE%

FROM opensuse/bci/openjdk:21

MAINTAINER openSUSE (https://www.opensuse.org/)

# Define labels according to https://en.opensuse.org/Building_derived_containers
# labelprefix=org.opensuse.bci.openjdk.devel
LABEL org.opencontainers.image.title="openSUSE Tumbleweed BCI OpenJDK 21 development"
LABEL org.opencontainers.image.description="OpenJDK 21 development container based on the openSUSE Tumbleweed Base Container Image."
LABEL org.opencontainers.image.version="21"
LABEL org.opencontainers.image.url="https://www.opensuse.org"
LABEL org.opencontainers.image.created="%BUILDTIME%"
LABEL org.opencontainers.image.vendor="openSUSE Project"
LABEL org.opencontainers.image.source="%SOURCEURL%"
LABEL org.opensuse.reference="registry.opensuse.org/opensuse/bci/openjdk-devel:21-%RELEASE%"
LABEL org.openbuildservice.disturl="%DISTURL%"
LABEL org.opensuse.lifecycle-url="https://en.opensuse.org/Lifetime"
LABEL org.opensuse.release-stage="released"

# endlabelprefix

RUN set -euo pipefail; zypper -n in --no-recommends java-21-openjdk-devel git-core maven; zypper -n clean; rm -rf /var/log/*
ENV JAVA_BINDIR="/usr/lib64/jvm/java-21-openjdk-21/bin"
ENV JAVA_HOME="/usr/lib64/jvm/java-21-openjdk-21"
ENV JAVA_ROOT="/usr/lib64/jvm/java-21-openjdk-21"
ENV JAVA_VERSION="21"

CMD ["/usr/bin/jshell"]
RUN set -euo pipefail; [ -d $JAVA_HOME ]; [ -d $JAVA_BINDIR ]; [ -f "$JAVA_BINDIR/java" ] && [ -x "$JAVA_BINDIR/java" ]
7 changes: 7 additions & 0 deletions openjdk-21-devel-image/_constraints
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
<constraints>
<hardware>
<disk>
<size unit="G">6</size>
</disk>
</hardware>
</constraints>
4 changes: 4 additions & 0 deletions openjdk-21-devel-image/_service
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
<services>
<service mode="buildtime" name="docker_label_helper"/>
<service mode="buildtime" name="kiwi_metainfo_helper"/>
</services>
4 changes: 4 additions & 0 deletions openjdk-21-devel-image/openjdk-21-devel-image.changes
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
-------------------------------------------------------------------
Fri Sep 22 10:47:41 UTC 2023 - SUSE Update Bot <[email protected]>

- First version of the OpenJDK 21 development BCI
32 changes: 32 additions & 0 deletions openjdk-21-image/Dockerfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
#!ExclusiveArch: aarch64 x86_64 ppc64le s390x
# SPDX-License-Identifier: MIT
#!BuildTag: opensuse/bci/openjdk:21
#!BuildTag: opensuse/bci/openjdk:21-%RELEASE%

FROM opensuse/tumbleweed:latest

MAINTAINER openSUSE (https://www.opensuse.org/)

# Define labels according to https://en.opensuse.org/Building_derived_containers
# labelprefix=org.opensuse.bci.openjdk
LABEL org.opencontainers.image.title="openSUSE Tumbleweed BCI OpenJDK 21 runtime"
LABEL org.opencontainers.image.description="OpenJDK 21 runtime container based on the openSUSE Tumbleweed Base Container Image."
LABEL org.opencontainers.image.version="21"
LABEL org.opencontainers.image.url="https://www.opensuse.org"
LABEL org.opencontainers.image.created="%BUILDTIME%"
LABEL org.opencontainers.image.vendor="openSUSE Project"
LABEL org.opencontainers.image.source="%SOURCEURL%"
LABEL org.opensuse.reference="registry.opensuse.org/opensuse/bci/openjdk:21-%RELEASE%"
LABEL org.openbuildservice.disturl="%DISTURL%"
LABEL org.opensuse.lifecycle-url="https://en.opensuse.org/Lifetime"
LABEL org.opensuse.release-stage="released"

# endlabelprefix

RUN set -euo pipefail; zypper -n in --no-recommends java-21-openjdk; zypper -n clean; rm -rf /var/log/*
ENV JAVA_BINDIR="/usr/lib64/jvm/java-21-openjdk-21/bin"
ENV JAVA_HOME="/usr/lib64/jvm/java-21-openjdk-21"
ENV JAVA_ROOT="/usr/lib64/jvm/java-21-openjdk-21"
ENV JAVA_VERSION="21"

RUN set -euo pipefail; [ -d $JAVA_HOME ]; [ -d $JAVA_BINDIR ]; [ -f "$JAVA_BINDIR/java" ] && [ -x "$JAVA_BINDIR/java" ]
7 changes: 7 additions & 0 deletions openjdk-21-image/_constraints
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
<constraints>
<hardware>
<disk>
<size unit="G">6</size>
</disk>
</hardware>
</constraints>
4 changes: 4 additions & 0 deletions openjdk-21-image/_service
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
<services>
<service mode="buildtime" name="docker_label_helper"/>
<service mode="buildtime" name="kiwi_metainfo_helper"/>
</services>
4 changes: 4 additions & 0 deletions openjdk-21-image/openjdk-21-image.changes
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
-------------------------------------------------------------------
Fri Sep 22 10:47:41 UTC 2023 - SUSE Update Bot <[email protected]>

- First version of the OpenJDK 21 runtime BCI

0 comments on commit bb79fbb

Please sign in to comment.