From fa46a8f2f2a57ae9b4cfb48dedcfc091d612d3a8 Mon Sep 17 00:00:00 2001
From: Eugene Zadyra <untrance@gmail.com>
Date: Sun, 18 Sep 2022 23:28:27 +0200
Subject: [PATCH] smaller result docker image

---
 .drone.yml              | 10 +++++-----
 docker/Dockerfile       |  2 +-
 docker/Dockerfile.arm64 | 13 -------------
 3 files changed, 6 insertions(+), 19 deletions(-)
 delete mode 100644 docker/Dockerfile.arm64

diff --git a/.drone.yml b/.drone.yml
index 23fa92b..50e4b79 100644
--- a/.drone.yml
+++ b/.drone.yml
@@ -8,7 +8,7 @@ platform:
 
 steps:
   - name: build
-    image: amd64/eclipse-temurin:11-jdk-focal
+    image: eclipse-temurin:11-jre-focal
     environment:
       GRADLE_USER_HOME: ~/.gradle
     command: [ /bin/bash ]
@@ -75,7 +75,7 @@ platform:
 
 steps:
   - name: build
-    image: arm64v8/eclipse-temurin:11-jdk-focal
+    image: eclipse-temurin:11-jre-focal
     environment:
       GRADLE_USER_HOME: ~/.gradle
     command: [ /bin/bash ]
@@ -84,7 +84,7 @@ steps:
       - echo -n "1.0.$DRONE_BUILD_NUMBER-arm64,latest-arm64" > .tags
       - echo -n "1.0.$DRONE_BUILD_NUMBER" > ./docker/version
 
-  - name: test Dockerfile.arm64
+  - name: test Dockerfile
     image: plugins/docker
     settings:
       repo: eugenezadyra/luxmed-bot
@@ -92,7 +92,7 @@ steps:
         from_secret: docker_username
       password:
         from_secret: docker_password
-      dockerfile: docker/Dockerfile.arm64
+      dockerfile: docker/Dockerfile
       context: docker/
       dry_run: yes
     when:
@@ -107,7 +107,7 @@ steps:
         from_secret: docker_username
       password:
         from_secret: docker_password
-      dockerfile: docker/Dockerfile.arm64
+      dockerfile: docker/Dockerfile
       context: docker/
     when:
       branch: master
diff --git a/docker/Dockerfile b/docker/Dockerfile
index 9112564..5532491 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -1,4 +1,4 @@
-FROM amd64/eclipse-temurin:11-jre-focal
+FROM eclipse-temurin:11-jre-focal
 
 RUN apt-get update -y && apt-get install -y netcat # nc command
 
diff --git a/docker/Dockerfile.arm64 b/docker/Dockerfile.arm64
deleted file mode 100644
index 0c0359a..0000000
--- a/docker/Dockerfile.arm64
+++ /dev/null
@@ -1,13 +0,0 @@
-FROM arm64v8/eclipse-temurin:11-jre-focal
-
-RUN apt-get update -y && apt-get install -y netcat # nc command
-
-RUN ln -fs /usr/share/zoneinfo/Europe/Warsaw /etc/localtime
-RUN dpkg-reconfigure -f noninteractive tzdata
-
-RUN mkdir -p /app
-ADD server.jar /app
-ADD run.sh run.sh
-ADD version /app/version
-RUN chmod +x run.sh
-CMD ./run.sh
\ No newline at end of file