adding autodeploy for dev

Author: Aayush-Agnihotri

.github/workflows/deploy-dev.yml

@@ -11,56 +11,35 @@ jobs:
     steps:
       - name: Checkout
         uses: actions/checkout@v2
-
       - name: Set up Docker Buildx
         uses: docker/setup-buildx-action@v1
-
       - name: Login to DockerHub
         uses: docker/login-action@v1
         with:
           username: ${{ secrets.DOCKER_USERNAME }}
           password: ${{ secrets.DOCKER_PASSWORD }}
-
-      # - name: Get SHA
-      #   id: vars
-      #   run: echo "::set-output name=sha_short::$(git rev-parse --short HEAD)"
-
-      - name: Docker Build & Push ghopper
-        uses: docker/build-push-action@v2
-        with:
-          context: ./docker-compose/ghopper
-          file: ./docker-compose/ghopper/Dockerfile
-          push: true
-          tags: cornellappdev/transit-ghopper:latest
-
-      - name: Docker Build & Push ghopper-walking
+      - name: Get SHA
+        id: vars
+        run: echo "::set-output name=sha_short::$(git rev-parse --short HEAD)"
+      - name: Docker Build & Push
         uses: docker/build-push-action@v2
         with:
-          context: ./docker-compose/ghopper-walking
-          file: ./docker-compose/ghopper-walking/Dockerfile
+          context: ./
+          file: ./Dockerfile
           push: true
-          tags: cornellappdev/transit-ghopper-walking:latest
-
-      - name: Docker Build & Push map
-        uses: docker/build-push-action@v2
+          tags: cornellappdev/transit-dev:${{ steps.vars.outputs.sha_short }}
+      - name: Remote SSH and Deploy
+        uses: appleboy/ssh-action@master
+        env:
+          IMAGE_TAG: ${{ steps.vars.outputs.sha_short }}
         with:
-          context: ./docker-compose/map
-          file: ./docker-compose/map/Dockerfile
-          push: true
-          tags: cornellappdev/transit-map:latest
-
-      # - name: Remote SSH and Deploy
-      #   uses: appleboy/ssh-action@master
-      #   env:
-      #     IMAGE_TAG: ${{ steps.vars.outputs.sha_short }}
-      #   with:
-      #     host: ${{ secrets.DEV_SERVER_HOST }}
-      #     username: ${{ secrets.SERVER_USERNAME }}
-      #     key: ${{ secrets.DEV_SERVER_KEY }}
-      #     script: |
-      #       export IMAGE_TAG=${{ steps.vars.outputs.sha_short }}
-      #       cd docker-compose
-      #       docker stack rm the-stack
-      #       sleep 20s
-      #       docker stack deploy -c docker-compose.yml the-stack
-      #       yes | docker system prune -a
+          host: ${{ secrets.DEV_SERVER_HOST }}
+          username: ${{ secrets.SERVER_USERNAME }}
+          key: ${{ secrets.DEV_SERVER_KEY }}
+          script: |
+            export IMAGE_TAG=${{ steps.vars.outputs.sha_short }}
+            cd docker-compose
+            docker stack rm the-stack
+            sleep 20s
+            docker stack deploy -c docker-compose.yml the-stack
+            yes | docker system prune -a

docker-compose/map/Dockerfile

@@ -7,15 +7,15 @@ RUN git clone --single-branch -b tcat-map https://github.com/cuappdev/ithaca-tra
 
 WORKDIR /usr/src/app
 
-RUN git clone --single-branch -b master https://github.com/graphhopper/map-matching.git
+RUN git clone --single-branch -b 0.11 https://github.com/graphhopper/map-matching.git
 
 WORKDIR /usr/src/app/map-matching
 
 RUN mvn package -e -DskipTests
-RUN java -jar matching-web/target/graphhopper-map-matching-web-*.jar import ../map.osm --vehicle=car,foot
+RUN java -jar matching-web/target/graphhopper-map-matching-web-0.11-SNAPSHOT.jar import ../map.osm --vehicle=car,foot
 
 COPY config.yml .
 
 EXPOSE 8989
 
-CMD java -jar matching-web/target/graphhopper-map-matching-web-*.jar server config.yml
+CMD java -jar matching-web/target/graphhopper-map-matching-web-0.11-SNAPSHOT.jar server config.yml