diff --git a/.github/workflows/deploy-admin-docker.yml b/.github/workflows/deploy-admin-docker.yml index ecb05971..b5c0b185 100644 --- a/.github/workflows/deploy-admin-docker.yml +++ b/.github/workflows/deploy-admin-docker.yml @@ -80,6 +80,12 @@ jobs: source: "docker-compose.yml" target: ${{ env.EC2_DEPLOY_PATH }} + - name: Login to DockerHub + uses: docker/login-action@v1 + with: + username: ${{ secrets.DOCKERHUB_USERNAME }} + password: ${{ secrets.DOCKERHUB_ACCESS_TOKEN }} + - name: Deploy to EC2 uses: appleboy/ssh-action@master env: diff --git a/docker-compose.yml b/docker-compose.yml index 7833a531..f8fcc56d 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -19,25 +19,25 @@ services: image: jihuneddie/nowait_dev:admin container_name: nowait-app-admin-api ports: - - "8085:8085" + - "8086:8085" depends_on: - mysql volumes: - ./nowait-app-admin-api:/app restart: always -# nowait-app-user-api: -# build: -# context: nowait-app-user-api -# dockerfile: Dockerfile -# container_name: nowait-app-user-api -# ports: -# - "8081:8081" -# depends_on: -# - mysql -# volumes: -# - ./nowait-app-user-api:/app -# restart: always + nowait-app-user-api: + build: + context: nowait-app-user-api + dockerfile: Dockerfile + container_name: nowait-app-user-api + ports: + - "8081:8081" + depends_on: + - mysql + volumes: + - ./nowait-app-user-api:/app + restart: always volumes: mysql_data: 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); } } +