From 07172866d97a1ceda0d0edaafe9b3798ac2e655c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C5=82=20Siatkowski?= Date: Wed, 10 Aug 2022 17:38:41 +0200 Subject: [PATCH] fix docker images & add to ci (#41) --- .drone.yml | 36 ++++++++++++++++++++++++++++++++++-- docker/Dockerfile | 8 ++++---- docker/Dockerfile.arm64 | 8 ++++---- 3 files changed, 42 insertions(+), 10 deletions(-) diff --git a/.drone.yml b/.drone.yml index f064dcb..8d50306 100644 --- a/.drone.yml +++ b/.drone.yml @@ -8,15 +8,31 @@ platform: steps: - name: build - image: amd64/openjdk:11-jdk-slim + image: amd64/eclipse-temurin:11-jdk-focal environment: GRADLE_USER_HOME: ~/.gradle + command: [ /bin/bash ] commands: - ./gradlew test - ./gradlew prepare - echo -n "1.0.$DRONE_BUILD_NUMBER,latest" > .tags - echo -n "1.0.$DRONE_BUILD_NUMBER" > ./docker/version + - name: test Dockerfile + image: plugins/docker + settings: + repo: eugenezadyra/luxmed-bot + username: + from_secret: docker_username + password: + from_secret: docker_password + dockerfile: docker/Dockerfile + context: docker/ + dry_run: yes + when: + event: + - pull_request + - name: publish image: plugins/docker settings: @@ -59,14 +75,30 @@ platform: steps: - name: build - image: arm64v8/openjdk:11-jdk-slim + image: arm64v8/eclipse-temurin:11-jdk-focal environment: GRADLE_USER_HOME: ~/.gradle + command: [ /bin/bash ] commands: - ./gradlew prepare - echo -n "1.0.$DRONE_BUILD_NUMBER-arm64,latest-arm64" > .tags - echo -n "1.0.$DRONE_BUILD_NUMBER" > ./docker/version + - name: test Dockerfile.arm64 + image: plugins/docker + settings: + repo: eugenezadyra/luxmed-bot + username: + from_secret: docker_username + password: + from_secret: docker_password + dockerfile: docker/Dockerfile.arm64 + context: docker/ + dry_run: yes + when: + event: + - pull_request + - name: publish image: plugins/docker settings: diff --git a/docker/Dockerfile b/docker/Dockerfile index 038c677..0ded868 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -1,9 +1,9 @@ -FROM amd64/openjdk:11-jre-slim +FROM amd64/eclipse-temurin:11-jre-focal + +RUN ln -fs /usr/share/zoneinfo/Europe/Warsaw /etc/localtime +RUN dpkg-reconfigure -f noninteractive tzdata -RUN apk update && apk upgrade && apk add netcat-openbsd tzdata && apk add --no-cache nss RUN mkdir -p /app -ENV TZ Europe/Warsaw -RUN echo "Europe/Warsaw" > /etc/timezone ADD server.jar /app ADD run.sh run.sh ADD version /app/version diff --git a/docker/Dockerfile.arm64 b/docker/Dockerfile.arm64 index 8254beb..b019b63 100644 --- a/docker/Dockerfile.arm64 +++ b/docker/Dockerfile.arm64 @@ -1,9 +1,9 @@ -FROM arm64v8/openjdk:11-jre-slim +FROM arm64v8/eclipse-temurin:11-jre-focal + +RUN ln -fs /usr/share/zoneinfo/Europe/Warsaw /etc/localtime +RUN dpkg-reconfigure -f noninteractive tzdata -RUN apk update && apk upgrade && apk add netcat-openbsd tzdata && apk add --no-cache nss RUN mkdir -p /app -ENV TZ Europe/Warsaw -RUN echo "Europe/Warsaw" > /etc/timezone ADD server.jar /app ADD run.sh run.sh ADD version /app/version