Merge pull request #180 from AndrewCS149/testWorkflow

testWorkflow
The-DevBlog · Apr 19, 2024 · 70510fd · 70510fd
2 parents d7ed715 + 0589831
commit 70510fd
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 8 deletions.
diff --git a/.github/workflows/staging.yml b/.github/workflows/staging.yml
@@ -51,12 +51,12 @@ jobs:
             - name: Copy Files to Server
               run: |
                 scp -i ${{ secrets.SSH_PRIVATE_KEY_PATH }}/${{ secrets.SSH_PRIVATE_KEY_NAME }} -r client/dist ${{ secrets.SSH_USER }}@${{ secrets.SSH_HOST }}:${{ vars.DEVBLOG_ROOT_PATH }}/client
-                scp -i ${{ secrets.SSH_PRIVATE_KEY_PATH }}/${{ secrets.SSH_PRIVATE_KEY_NAME }} docker-compose.yaml ${{ secrets.SSH_USER }}@${{ secrets.SSH_HOST }}:${{ vars.DEVBLOG_ROOT_PATH }}
+                scp -i ${{ secrets.SSH_PRIVATE_KEY_PATH }}/${{ secrets.SSH_PRIVATE_KEY_NAME }} docker-compose.yml ${{ secrets.SSH_USER }}@${{ secrets.SSH_HOST }}:${{ vars.DEVBLOG_ROOT_PATH }}
 
             - name: Restart Container
               run: |
                 ssh -i ${{ secrets.SSH_PRIVATE_KEY_PATH }}/${{ secrets.SSH_PRIVATE_KEY_NAME }} ${{ secrets.SSH_USER }}@${{ secrets.SSH_HOST }} "\
-                cd ${{ vars.DEVBLOG_ROOT_PATH }}/../ && \
+                cd ${{ vars.DEVBLOG_ROOT_PATH }} && \
                 docker container rm -f ${{ vars.DEVBLOG_CONTAINER }} || true && \
                 docker compose up -d"
           
diff --git a/docker-compose.yaml → docker-compose.yml b/docker-compose.yaml → docker-compose.yml
@@ -4,22 +4,22 @@ services:
     build: ./proxy
     container_name: proxy
     depends_on:
-      - devblog_staging_client
+      - devblog_client
     volumes:
       - /home/devmaster/app/proxy/default.conf:/etc/nginx/conf.d/default.conf
-      - /etc/ssl/certs/andrewtest.org:/etc/ssl/certs/andrewtest.org
+      - /etc/ssl/certs/${DEVBLOG_CERT_NAME}:/etc/ssl/certs/${DEVBLOG_CERT_NAME}
     restart: on-failure
     ports:
       - 443:443
 
-  devblog_staging_client:
-   image: andrewtest.org_client
+  devblog_client:
+   image: ${DEVBLOG_CONTAINER_NAME}
    build: ./client
-   container_name: andrewtest.org_client
+   container_name: ${DEVBLOG_CONTAINER_NAME}
    restart: on-failure
    volumes:
      - ./client/dist:/app
      - ./client/nginx.conf:/etc/nginx/nginx.conf
-     - /etc/ssl/certs/andrewtest.org:/etc/ssl/certs/andrewtest.org
+     - /etc/ssl/certs/${DEVBLOG_CERT_NAME}:/etc/ssl/certs/${DEVBLOG_CERT_NAME}
    ports:
      - 8082:443