test 2

FluroAsh · Jul 25, 2024 · 19cbd7f · 19cbd7f
1 parent 577cd4d
commit 19cbd7f
Show file tree

Hide file tree

Showing 2 changed files with 33 additions and 32 deletions.
diff --git a/.github/workflows/strapi-deploy.yml b/.github/workflows/strapi-deploy.yml
@@ -51,32 +51,44 @@ jobs:
           echo "${{ secrets.SSH_PRIVATE_KEY }}" > ~/.ssh/id_rsa
           chmod 600 ~/.ssh/id_rsa
           ssh-keyscan -t rsa ${{ secrets.SERVER_IP }} >> ~/.ssh/known_hosts
-      - name: Copy docker-compose & Dockerfile to remote server
+      - name: Copy repository to remote server
         run: |
-          ssh ${{ secrets.SERVER_USERNAME }}@${{ secrets.SERVER_IP }} "mkdir -p ~/at-blog"
-          scp -r server/docker-compose.yml server/Dockerfile ${{ secrets.SERVER_USERNAME }}@${{ secrets.SERVER_IP }}:~/at-blog/
-      - name: Create .env file
+          ssh ${{ secrets.SERVER_USERNAME }}@${{ secrets.SERVER_IP }} << EOF
+            rm -rf ~/nextjs-portfolio
+            mkdir -p ~/nextjs-portfolio
+          EOF
+          scp -r server ${{ secrets.SERVER_USERNAME }}@${{ secrets.SERVER_IP }}:~/nextjs-portfolio/
+      - name: Create .env file on remote server
         run: |
-          echo "DATABASE_URL=${{ secrets.DATABASE_URL }}" >> .env
-          echo "JWT_SECRET=${{ secrets.JWT_SECRET }}" >> .env
-          echo "API_TOKEN_SALT=${{ secrets.API_TOKEN_SALT }}" >> .env
-          echo "APP_KEYS=${{ secrets.APP_KEYS }}" >> .env
-          echo "NODE_ENV=${{ secrets.NODE_ENV }}" >> .env
-          echo "AWS_ACCESS_KEY_ID=${{ secrets.AWS_ACCESS_KEY_ID }}" >> .env
-          echo "AWS_ACCESS_SECRET=${{ secrets.AWS_ACCESS_SECRET }}" >> .env
-          echo "AWS_BUCKET_NAME=${{ secrets.AWS_BUCKET_NAME }}" >> .env
-          echo "AWS_REGION=${{ secrets.AWS_REGION }}" >> .env
-          echo "DATABASE_USERNAME=${{ secrets.DATABASE_USERNAME }}" >> .env
-          echo "DATABASE_PASSWORD=${{ secrets.DATABASE_PASSWORD }}" >> .env
-          echo "DATABASE_NAME=${{ secrets.DATABASE_NAME }}" >> .env
-          scp .env ${{ secrets.SERVER_USERNAME }}@${{ secrets.SERVER_IP }}:~/at-blog/.env
+          ssh ${{ secrets.SERVER_USERNAME }}@${{ secrets.SERVER_IP }} << 'EOF'
+            cat > ~/nextjs-portfolio/server/.env << 'ENV_EOF'
+            DATABASE_URL=${{ secrets.DATABASE_URL }}
+            JWT_SECRET=${{ secrets.JWT_SECRET }}
+            API_TOKEN_SALT=${{ secrets.API_TOKEN_SALT }}
+            APP_KEYS=${{ secrets.APP_KEYS }}
+            NODE_ENV=${{ secrets.NODE_ENV }}
+            AWS_ACCESS_KEY_ID=${{ secrets.AWS_ACCESS_KEY_ID }}
+            AWS_ACCESS_SECRET=${{ secrets.AWS_ACCESS_SECRET }}
+            AWS_BUCKET_NAME=${{ secrets.AWS_BUCKET_NAME }}
+            AWS_REGION=${{ secrets.AWS_REGION }}
+            DATABASE_USERNAME=${{ secrets.DATABASE_USERNAME }}
+            DATABASE_PASSWORD=${{ secrets.DATABASE_PASSWORD }}
+            DATABASE_NAME=${{ secrets.DATABASE_NAME }}
+            ENV_EOF
+          EOF
+      - name: Login to Docker Hub
+        uses: docker/login-action@v3
+        with:
+          username: ${{ secrets.DOCKERHUB_USERNAME }}
+          password: ${{ secrets.DOCKERHUB_TOKEN }}
       - name: Deploy to remote server
+        timeout-minutes: 10
         run: |
           ssh ${{ secrets.SERVER_USERNAME }}@${{ secrets.SERVER_IP }} << EOF
-            cd ~/at-blog
-            docker-compose -f docker-compose.yml pull
-            docker-compose -f docker-compose.yml up -d
+            cd ~/nextjs-portfolio/server
+            docker compose -f docker-compose.yml pull 
+            docker compose -f docker-compose.yml up -d
           EOF
       # - name: Clean up remote .env
       #   run: |
-      #     ssh ${{ secrets.SERVER_USERNAME }}@${{ secrets.SERVER_IP }} "rm ~/at-blog/.env"
+      #     ssh ${{ secrets.SERVER_USERNAME }}@${{ secrets.SERVER_IP }} "rm ~/nextjs-portfolio/.env"
diff --git a/server/Dockerfile b/server/Dockerfile
@@ -14,17 +14,6 @@ ENV AWS_ACCESS_SECRET=${AWS_ACCESS_SECRET}
 ENV AWS_BUCKET_NAME=${AWS_BUCKET_NAME}
 ENV AWS_REGION=${AWS_REGION}
 
-# Debugging Variables
-RUN echo $NODE_ENV
-RUN echo $DATABASE_URL
-RUN echo $JWT_SECRET
-RUN echo $API_TOKEN_SALT
-RUN echo $APP_KEYS
-RUN echo $AWS_ACCESS_KEY_ID
-RUN echo $AWS_ACCESS_SECRET
-RUN echo $AWS_BUCKET_NAME
-RUN echo $AWS_REGION
-
 WORKDIR /opt/
 COPY package*.json ./