update alpine to java 21

lavalink-devs · Feb 4, 2025 · ade3e1f · ade3e1f
1 parent a091df0
commit ade3e1f
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 7 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -88,12 +88,15 @@ jobs:
           - name: Ubuntu
             dockerfile: LavalinkServer/docker/Dockerfile
             suffix: ''
+            platforms: linux/amd64,linux/arm/v7,linux/arm64/v8
           - name: Alpine
             dockerfile: LavalinkServer/docker/alpine.Dockerfile
             suffix: '-alpine'
+            platforms: linux/amd64,linux/arm64/v8
           - name: Distroless
             dockerfile: LavalinkServer/docker/distroless.Dockerfile
             suffix: '-distroless'
+            platforms: linux/amd64,linux/arm64/v8
     steps:
       - name: Checkout
         uses: actions/checkout@v4
@@ -160,7 +163,7 @@ jobs:
         with:
           file: ${{ matrix.dockerfile }}
           context: .
-          platforms: linux/amd64,linux/arm/v7,linux/arm64/v8
+          platforms: ${{ matrix.platforms }}
           push: true
           tags: ${{ steps.meta.outputs.tags }}
           labels: ${{ steps.meta.outputs.labels }}
diff --git a/LavalinkServer/docker/alpine.Dockerfile b/LavalinkServer/docker/alpine.Dockerfile
@@ -1,4 +1,4 @@
-FROM azul/zulu-openjdk-alpine:17-jre-headless-latest
+FROM azul/zulu-openjdk-alpine:21-jre-headless-latest
 
 RUN apk add --no-cache libgcc
 

diff --git a/docs/configuration/docker.md b/docs/configuration/docker.md
@@ -9,11 +9,11 @@ Install [Docker](https://docs.docker.com/engine/install/) & [Docker Compose](htt
 
 ## Docker Image Variants
 
-| Variant      | Description                                  | User  | Group | Example                                       |
-|--------------|----------------------------------------------|-------|-------|-----------------------------------------------|
-| `Ubuntu`     | Default variant, based on Ubuntu             | 322   | 322   | `ghcr.io/lavalink-devs/lavalink:4`            |
-| `Alpine`     | Smaller image size, based on Alpine          | 322   | 322   | `ghcr.io/lavalink-devs/lavalink:4-alpine`     |
-| `Distroless` | Even smaller image size, based on Distroless | 65534 | 65534 | `ghcr.io/lavalink-devs/lavalink:4-distroless` |
+| Variant      | Description                                  | Java Version | User  | Group | Example                                       |
+|--------------|----------------------------------------------|--------------|-------|-------|-----------------------------------------------|
+| `Ubuntu`     | Default variant, based on Ubuntu             | 18           | 322   | 322   | `ghcr.io/lavalink-devs/lavalink:4`            |
+| `Alpine`     | Smaller image size, based on Alpine          | 21           | 322   | 322   | `ghcr.io/lavalink-devs/lavalink:4-alpine`     |
+| `Distroless` | Even smaller image size, based on Distroless | 21           | 65534 | 65534 | `ghcr.io/lavalink-devs/lavalink:4-distroless` |
 
 Create a `docker-compose.yml` with the following content: