diff --git a/.github/workflows/deploy-admin-docker.yml b/.github/workflows/deploy-admin-docker.yml index 49c52994..468bca8e 100644 --- a/.github/workflows/deploy-admin-docker.yml +++ b/.github/workflows/deploy-admin-docker.yml @@ -56,11 +56,12 @@ jobs: - name: Build and Push Docker Image run: | - docker build -t ${{ secrets.DOCKERHUB_USERNAME }}/admin/nowait-app-admin-api ./nowait-app-admin-api - docker push ${{ secrets.DOCKERHUB_USERNAME }}/admin/nowait-app-admin-api - + docker build -t ${{ secrets.DOCKERHUB_USERNAME }}/nowait_dev:admin-${{ github.sha }} ./nowait-app-admin-api + docker push ${{ secrets.DOCKERHUB_USERNAME }}/nowait_dev:admin-${{ github.sha }} - deploy: + + +deploy: name: Deploy to EC2 runs-on: ubuntu-latest needs: build-with-gradle diff --git a/docker-compose.yml b/docker-compose.yml index 853ac661..60c052da 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -18,7 +18,7 @@ services: # build: # context: nowait-app-admin-api # dockerfile: Dockerfile - image: jihuneddie/admin/nowait-app-admin-api:latest + image: jihuneddie/nowait_dev:admin- container_name: nowait-app-admin-api ports: diff --git a/nowait-app-admin-api/src/main/java/com/nowait/ApiAdminApplication.java b/nowait-app-admin-api/src/main/java/com/nowait/ApiAdminApplication.java index 1098599d..363e737d 100644 --- a/nowait-app-admin-api/src/main/java/com/nowait/ApiAdminApplication.java +++ b/nowait-app-admin-api/src/main/java/com/nowait/ApiAdminApplication.java @@ -10,3 +10,4 @@ public static void main(String[] args) { org.springframework.boot.SpringApplication.run(ApiAdminApplication.class, args); } } +