Skip to content

Commit

Permalink
Merge pull request #193 from scireum/jge/feature/jdk17-arm64-image
Browse files Browse the repository at this point in the history
change to OpenJDK 17 with a Docker Image for amd64 and arm64 (closes #192)
  • Loading branch information
hggh committed Dec 20, 2021
2 parents ca2b261 + 05df2d8 commit f2b54ff
Show file tree
Hide file tree
Showing 2 changed files with 12 additions and 9 deletions.
19 changes: 11 additions & 8 deletions .drone.yml
Expand Up @@ -17,7 +17,7 @@ clone:

steps:
- name: compile
image: hub.scireum.com/scireum/sirius-build-jdk16:latest
image: scireum/sirius-build-jdk17:latest
commands:
- mvn clean compile
volumes: *scireum_volumes
Expand All @@ -26,7 +26,7 @@ steps:
- push

- name: test
image: hub.scireum.com/scireum/sirius-build-jdk16:latest
image: scireum/sirius-build-jdk17:latest
commands:
- mvn clean test
volumes: *scireum_volumes
Expand All @@ -35,7 +35,7 @@ steps:
- pull_request

- name: sonar
image: hub.scireum.com/scireum/sirius-build-jdk16:latest
image: scireum/sirius-build-jdk17:latest
commands:
- "sed -i 's/DEVELOPMENT-SNAPSHOT/${DRONE_TAG}/g' pom.xml"
- "mvn clean org.jacoco:jacoco-maven-plugin:prepare-agent test sonar:sonar -Dsonar.projectKey=${DRONE_REPO_NAME}"
Expand All @@ -45,7 +45,7 @@ steps:
- tag

- name: package
image: hub.scireum.com/scireum/sirius-build-jdk16:latest
image: scireum/sirius-build-jdk17:latest
commands:
- "sed -i 's/DEVELOPMENT-SNAPSHOT/${DRONE_TAG}/g' pom.xml"
- mvn clean package -DskipTests
Expand All @@ -55,12 +55,15 @@ steps:
- tag

- name: publish
image: plugins/docker
image: jgescireum/buildx:latest
settings:
repo: scireum/s3-ninja
platforms:
- linux/amd64
- linux/arm64
tags:
- latest
- "${DRONE_TAG}"
- scireum/s3-ninja:latest
- scireum/s3-ninja:"${DRONE_TAG}"
environment:
DOCKER_PASSWORD:
from_secret: docker_password
Expand All @@ -72,7 +75,7 @@ steps:
- tag

- name: site
image: hub.scireum.com/scireum/sirius-build-jdk16:latest
image: scireum/sirius-build-jdk17:latest
commands:
- "echo \"$SSH_KEY\" > /tmp/sshkey"
- chmod 600 /tmp/sshkey
Expand Down
2 changes: 1 addition & 1 deletion Dockerfile
@@ -1,4 +1,4 @@
FROM hub.scireum.com/scireum/sirius-runtime-jdk16:32
FROM scireum/sirius-runtime-jdk17:48

RUN mkdir /home/sirius/data && \
mkdir /home/sirius/multipart && \
Expand Down

0 comments on commit f2b54ff

Please sign in to comment.