From 34938614e324c3ca678913b023dff153d64e8f23 Mon Sep 17 00:00:00 2001 From: Eduard Kuksa Date: Thu, 13 Feb 2025 22:44:11 +0700 Subject: [PATCH] cut code and add target dir to Dockerfile --- .gitea/workflows/maven.yml | 6 +----- Dockerfile | 2 +- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/.gitea/workflows/maven.yml b/.gitea/workflows/maven.yml index 2a5d4e0..5f6a592 100644 --- a/.gitea/workflows/maven.yml +++ b/.gitea/workflows/maven.yml @@ -62,11 +62,7 @@ jobs: key: ${{ secrets.SSH_PRIVATE_KEY }} known_hosts: ${{ secrets.KNOWN_HOSTS }} - name: Deploy to Local Server - run: | - scp -r artifact/* ${{ vars.DEPLOY_USER }}@${{ vars.DEPLOY_HOST }}:${{ vars.DEPLOY_PATH }} -# scp artifact/target/*.jar ${{ vars.DEPLOY_USER }}@${{ vars.DEPLOY_HOST }}:${{ vars.DEPLOY_PATH }} -# scp artifact/Dockerfile ${{ vars.DEPLOY_USER }}@${{ vars.DEPLOY_HOST }}:${{ vars.DEPLOY_PATH }} -# scp artifact/docker-compose.yml ${{ vars.DEPLOY_USER }}@${{ vars.DEPLOY_HOST }}:${{ vars.DEPLOY_PATH }} + run: scp -r artifact/* ${{ vars.DEPLOY_USER }}@${{ vars.DEPLOY_HOST }}:${{ vars.DEPLOY_PATH }} - name: Build and Run Docker Image with Docker Compose run: | ssh ${{ vars.DEPLOY_USER }}@${{ vars.DEPLOY_HOST }} << EOF diff --git a/Dockerfile b/Dockerfile index 0851a1a..10c378b 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,5 +1,5 @@ FROM openjdk:21-jdk-slim WORKDIR /app -COPY spring-demo-0.1.1-SNAPSHOT.jar spring-demo-0.1.1-SNAPSHOT.jar +COPY target/spring-demo-0.1.1-SNAPSHOT.jar spring-demo-0.1.1-SNAPSHOT.jar EXPOSE 8080 CMD ["java", "-jar", "spring-demo-0.1.1-SNAPSHOT.jar"] \ No newline at end of file