Skip to content

Commit

Permalink
Add java-jre22 and update others
Browse files Browse the repository at this point in the history
  • Loading branch information
hwalker928 committed Apr 6, 2024
1 parent 4fce2a7 commit 92a4ddd
Show file tree
Hide file tree
Showing 10 changed files with 79 additions and 11 deletions.
34 changes: 34 additions & 0 deletions .github/workflows/java-jre22.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
name: Build java-jre22
on:
push:
branches:
- main
paths:
- java/java-jre22/*
- java/entrypoint.sh
- .github/workflows/java-jre22.yml
jobs:
push:
name: "java-jre22"
runs-on: ubuntu-latest
strategy:
fail-fast: false
steps:
- uses: actions/checkout@v3
- uses: docker/setup-buildx-action@v2
with:
version: "v0.9.1"
buildkitd-flags: --debug
- uses: docker/login-action@v2
with:
registry: ghcr.io
username: ${{ github.repository_owner }}
password: ${{ secrets.GITHUB_TOKEN }}
- uses: docker/build-push-action@v3
with:
context: ./java
file: ./java/java-jre22/Dockerfile
platforms: linux/amd64
push: true
tags: |
ghcr.io/sparkedhost/images:java-jre22
2 changes: 1 addition & 1 deletion java/java-jre11/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
# Image: ghcr.io/sparkedhost/images:java-jre11
# ----------------------------------

FROM debian:bullseye-slim
FROM debian:bookworm-slim

LABEL author="DevOps Team at Sparked Host" maintainer="[email protected]"

Expand Down
2 changes: 1 addition & 1 deletion java/java-jre16/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
# Image: ghcr.io/sparkedhost/images:java-jre16
# ----------------------------------

FROM debian:bullseye-slim
FROM debian:bookworm-slim

LABEL author="DevOps Team at Sparked Host" maintainer="[email protected]"

Expand Down
4 changes: 2 additions & 2 deletions java/java-jre17/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
# Image: ghcr.io/sparkedhost/images:java-jre17
# ----------------------------------

FROM debian:bullseye-slim
FROM debian:bookworm-slim

LABEL author="DevOps Team at Sparked Host" maintainer="[email protected]"

Expand All @@ -13,7 +13,7 @@ RUN apt-get update -y \
&& mkdir -p /opt/java

# Download pre-built Temurin JRE binaries
ADD https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.7%2B7/OpenJDK17U-jdk_x64_linux_hotspot_17.0.7_7.tar.gz /opt/java/java.tar.gz
ADD https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.9%2B9/OpenJDK17U-jre_x64_linux_hotspot_17.0.9_9.tar.gz /opt/java/java.tar.gz
RUN tar -C /opt/java --strip-components=1 -xzf /opt/java/java.tar.gz \
&& rm -f /opt/java/java.tar.gz

Expand Down
2 changes: 1 addition & 1 deletion java/java-jre18/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
# Image: ghcr.io/sparkedhost/images:java-jre18
# ----------------------------------

FROM debian:bullseye-slim
FROM debian:bookworm-slim

LABEL author="DevOps Team at Sparked Host" maintainer="[email protected]"

Expand Down
2 changes: 1 addition & 1 deletion java/java-jre19/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
# Image: ghcr.io/sparkedhost/images:java-jre19
# ----------------------------------

FROM debian:bullseye-slim
FROM debian:bookworm-slim

LABEL author="DevOps Team at Sparked Host" maintainer="[email protected]"

Expand Down
2 changes: 1 addition & 1 deletion java/java-jre20/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
# Image: ghcr.io/sparkedhost/images:java-jre20
# ----------------------------------

FROM debian:bullseye-slim
FROM debian:bookworm-slim

LABEL author="DevOps Team at Sparked Host" maintainer="[email protected]"

Expand Down
4 changes: 2 additions & 2 deletions java/java-jre21/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
# Image: ghcr.io/sparkedhost/images:java-jre21
# ----------------------------------

FROM debian:bullseye-slim
FROM debian:bookworm-slim

LABEL author="DevOps Team at Sparked Host" maintainer="[email protected]"

Expand All @@ -13,7 +13,7 @@ RUN apt-get update -y \
&& mkdir -p /opt/java

# Download pre-built Temurin JRE binaries
ADD https://github.com/adoptium/temurin21-binaries/releases/download/jdk-21.0.1%2B12/OpenJDK21U-jre_x64_linux_hotspot_21.0.1_12.tar.gz /opt/java/java.tar.gz
ADD https://github.com/adoptium/temurin21-binaries/releases/download/jdk-21.0.2%2B13/OpenJDK21U-jre_x64_linux_hotspot_21.0.2_13.tar.gz /opt/java/java.tar.gz
RUN tar -C /opt/java --strip-components=1 -xzf /opt/java/java.tar.gz \
&& rm -f /opt/java/java.tar.gz

Expand Down
34 changes: 34 additions & 0 deletions java/java-jre22/Dockerfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
# ----------------------------------
# Sparked Host Custom Docker Image
# Image: ghcr.io/sparkedhost/images:java-jre22
# ----------------------------------

FROM debian:bookworm-slim

LABEL author="DevOps Team at Sparked Host" maintainer="[email protected]"

RUN apt-get update -y \
&& apt-get install fontconfig iproute2 curl ca-certificates tar -y \
&& useradd -d /home/container -m container \
&& mkdir -p /opt/java

# Download pre-built Temurin JRE binaries
ADD https://github.com/adoptium/temurin22-binaries/releases/download/jdk-22%2B36/OpenJDK22U-jre_x64_linux_hotspot_22_36.tar.gz /opt/java/java.tar.gz
RUN tar -C /opt/java --strip-components=1 -xzf /opt/java/java.tar.gz \
&& rm -f /opt/java/java.tar.gz

# Add Sparked certificate authority
ADD ca.crt /usr/local/share/ca-certificates/sparked-ca.crt
RUN chmod 644 /usr/local/share/ca-certificates/sparked-ca.crt && update-ca-certificates

# Set user that will run the entrypoint script, and overwrite USER, HOME and PATH environment variables
# We need to inject the path to the Java binaries in the PATH environment variable
USER container
ENV USER=container HOME=/home/container PATH="$PATH:/opt/java/bin" LANG=C.UTF-8

WORKDIR /home/container

COPY ./entrypoint.sh /entrypoint.sh

CMD ["/bin/bash", "/entrypoint.sh"]

4 changes: 2 additions & 2 deletions java/java-jre8/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
# Image: ghcr.io/sparkedhost/images:java-jre8
# ----------------------------------

FROM debian:bullseye-slim
FROM debian:bookworm-slim

LABEL author="DevOps Team at Sparked Host" maintainer="[email protected]"

Expand All @@ -13,7 +13,7 @@ RUN apt-get update -y \
&& mkdir -p /opt/java

# Download pre-built Temurin JRE binaries
ADD https://github.com/adoptium/temurin8-binaries/releases/download/jdk8u382-b05/OpenJDK8U-jre_x64_linux_hotspot_8u382b05.tar.gz /opt/java/java.tar.gz
ADD https://github.com/adoptium/temurin8-binaries/releases/download/jdk8u402-b06/OpenJDK8U-jre_x64_linux_hotspot_8u402b06.tar.gz /opt/java/java.tar.gz
RUN tar -C /opt/java --strip-components=1 -xzf /opt/java/java.tar.gz \
&& rm -f /opt/java/java.tar.gz

Expand Down

0 comments on commit 92a4ddd

Please sign in to comment.