Commit 3c3a4cb0 authored by Heimo Stranner's avatar Heimo Stranner
Browse files

jdk 21

parent 4f0c403c

.gitlab-ci.yml

+13 −1
Original line number Diff line number Diff line
@@ -62,6 +62,12 @@ build-mvn-non-root-17: 
    DIR: mvn-non-root-17

    NAME: mvn-non-root-17



build-mvn-non-root-21:

  extends: .build-base

  variables:

    DIR: mvn-non-root-21

    NAME: mvn-non-root-21



.mirror-base:

  stage: build

  resource_group: lock_docker_build_$FROM_$TO
@@ -75,12 +81,18 @@ build-mvn-non-root-17: 
  only:

    - master



sync-temurin:

sync-temurin-17:

  extends: .mirror-base

  variables:

    FROM: docker.io/library/eclipse-temurin:17

    TO: eclipse-temurin:17



sync-jdk-21:

  extends: .mirror-base

  variables:

    FROM: docker.io/library/amazoncorretto:21-alpine-jdk

    TO: jdk:21



sync-kubectl:

  extends: .mirror-base

  variables:

README.md

+8 −3
Original line number Diff line number Diff line
@@ -21,6 +21,10 @@ npm ERR! Error: spawn EPERM 


`registry.reset.inso-w.at/pub/docker/mvn-non-root-17` is based on the mvn:3-openjdk-17 image but adds a user `build` and sets it as the default user.



### Maven 3 JDK 21 rootless



`registry.reset.inso-w.at/pub/docker/mvn-non-root-21` is based on the mvn:3-amazoncorretto-21-debian image but adds a user `build` and sets it as the default user.



### Custom cypress image



The stock cypress base image is based on debian 10, ours is based on debian 11 so we can install version 17 of the openjdk.
@@ -42,7 +46,7 @@ Perhaps you want to interact with the k8s cluster more directly. This version of 


## Debian with maven



A simple debian based maven installation.

A simple debian based maven installation with maven and jdk 21.



`registry.reset.inso-w.at/pub/docker/debian-mvn`
@@ -58,5 +62,6 @@ A simple debian based maven installation. 


|local name  |mirrored from  |livespan       |

|------------|---------------|---------------|

|registry.reset.inso-w.at/pub/docker/eclipse-temurin:17 | eclipse-temurin:17 | will be updated to the current LTS version of the jdk and kept indefinitely |

|registry.reset.inso-w.at/pub/docker/kubectl | bitnami/kubectl | will be kept until at least 2023-08-01 |
 
|registry.reset.inso-w.at/pub/docker/jdk:21 | amazoncorretto:21-alpine-jdk | will be be kept until at least 2024-02-01 |

|registry.reset.inso-w.at/pub/docker/eclipse-temurin:17 | eclipse-temurin:17 | will be be kept until at least 2024-02-01 |

|registry.reset.inso-w.at/pub/docker/kubectl | bitnami/kubectl | will be kept until at least 2024-02-01 |

debian-mvn/Dockerfile

+1 −1
Original line number Diff line number Diff line 
FROM debian:sid

RUN apt-get update && apt-get -y install curl maven openjdk-17-jdk jq zip rsync
 
RUN apt-get update && apt-get -y install curl maven openjdk-21-jdk jq zip rsync

mvn-non-root-21/Dockerfile

0 → 100644
+3 −0
Original line number Diff line number Diff line 
FROM docker.io/library/maven:3-amazoncorretto-21-debian

RUN useradd -m build

USER build