From faf61e2b3bf90f3c3ee97552aac92d9ccf212a5d Mon Sep 17 00:00:00 2001
From: Skydust <evann.jallet@gmail.com>
Date: Sat, 9 Sep 2023 23:15:55 +0200
Subject: [PATCH] Fixed the docker secret

---
 .gitea/workflows/production.yml | 10 +++++-----
 Dockerfile                      |  4 ++--
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/.gitea/workflows/production.yml b/.gitea/workflows/production.yml
index a52fc21..99ab070 100644
--- a/.gitea/workflows/production.yml
+++ b/.gitea/workflows/production.yml
@@ -23,10 +23,10 @@ jobs:
       - name: Docker build
         run: |
           echo ${{ secrets.DOCKER_TOKEN }} | docker login gitea.skydust.fr -u ${{ secrets.DOCKER_USER }} --password-stdin
-          docker build . -t gitea.skydust.fr/skydust/${{ env.DOCKER_IMAGE_NAME }}
-          docker tag gitea.skydust.fr/skydust/${{ env.DOCKER_IMAGE_NAME }} gitea.skydust.fr/skydust/${{ env.DOCKER_IMAGE_NAME }}:latest
+          docker build . -t gitea.skydust.fr/${{ secrets.DOCKER_USER }}/${{ env.DOCKER_IMAGE_NAME }}
+          docker tag gitea.skydust.fr/${{ secrets.DOCKER_USER }}/${{ env.DOCKER_IMAGE_NAME }} gitea.skydust.fr/${{ secrets.DOCKER_USER }}/${{ env.DOCKER_IMAGE_NAME }}:latest
       - name: Docker push
-        run: docker push gitea.skydust.fr/skydust/${{ env.DOCKER_IMAGE_NAME }}:latest
+        run: docker push gitea.skydust.fr/${{ secrets.DOCKER_USER }}/${{ env.DOCKER_IMAGE_NAME }}:latest
 
   deploy:
     name: Deploying
@@ -50,6 +50,6 @@ jobs:
             docker stop ${{ env.DOCKER_IMAGE_NAME }} || true
             docker rm ${{ env.DOCKER_IMAGE_NAME }} || true
             docker image rm \${PREVIOUS_IMAGE} || true
-            docker pull gitea.skydust.fr/skydust/${{ env.DOCKER_IMAGE_NAME }}:latest
-            docker run --restart=always -d --name="${{ env.DOCKER_IMAGE_NAME }}" gitea.skydust.fr/skydust/${{ env.DOCKER_IMAGE_NAME }}:latest
+            docker pull gitea.skydust.fr/${{ secrets.DOCKER_USER }}/${{ env.DOCKER_IMAGE_NAME }}:latest
+            docker run --restart=always -d --name="${{ env.DOCKER_IMAGE_NAME }}" gitea.skydust.fr/${{ secrets.DOCKER_USER }}/${{ env.DOCKER_IMAGE_NAME }}:latest
           EOF
\ No newline at end of file
diff --git a/Dockerfile b/Dockerfile
index 641bf75..8b908ce 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,9 +1,9 @@
-FROM openjdk:18-ea-jdk-slim-bullseye AS builder
+FROM public.ecr.aws/docker/library/eclipse-temurin:20.0.2_9-jdk AS builder
 WORKDIR /app
 COPY . /app
 RUN ./gradlew shadowJar
 
-FROM openjdk:18-ea-slim-bullseye AS runner
+FROM public.ecr.aws/docker/library/eclipse-temurin:20.0.2_9-jre AS runner
 LABEL authors="skydust"
 WORKDIR /app
 
-- 
2.49.1