Fixed the docker secret #2

Merged
Skydust merged 1 commits from r/fix-build-vars into dev 2023-09-09 21:30:11 +00:00
2 changed files with 7 additions and 7 deletions
Showing only changes of commit faf61e2b3b - Show all commits

View File

@@ -23,10 +23,10 @@ jobs:
- name: Docker build - name: Docker build
run: | run: |
echo ${{ secrets.DOCKER_TOKEN }} | docker login gitea.skydust.fr -u ${{ secrets.DOCKER_USER }} --password-stdin 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 build . -t gitea.skydust.fr/${{ secrets.DOCKER_USER }}/${{ env.DOCKER_IMAGE_NAME }}
docker tag gitea.skydust.fr/skydust/${{ env.DOCKER_IMAGE_NAME }} gitea.skydust.fr/skydust/${{ env.DOCKER_IMAGE_NAME }}:latest 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 - 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: deploy:
name: Deploying name: Deploying
@@ -50,6 +50,6 @@ jobs:
docker stop ${{ env.DOCKER_IMAGE_NAME }} || true docker stop ${{ env.DOCKER_IMAGE_NAME }} || true
docker rm ${{ env.DOCKER_IMAGE_NAME }} || true docker rm ${{ env.DOCKER_IMAGE_NAME }} || true
docker image rm \${PREVIOUS_IMAGE} || true docker image rm \${PREVIOUS_IMAGE} || true
docker pull 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/skydust/${{ 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 EOF

View File

@@ -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 WORKDIR /app
COPY . /app COPY . /app
RUN ./gradlew shadowJar 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" LABEL authors="skydust"
WORKDIR /app WORKDIR /app