From eb438e2c58a59e3ac16e83aadad1cbe93e4470f3 Mon Sep 17 00:00:00 2001 From: Muhammet Ali Topcu <42305974+alitpc25@users.noreply.github.com> Date: Sat, 25 Nov 2023 05:21:02 +0300 Subject: [PATCH 1/8] Update deploy.yml Updated deploy.yml to work with the encrypted file --- .github/workflows/deploy.yml | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index cd48b749..fab6dae7 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -13,6 +13,13 @@ jobs: - name: Checkout Repository uses: actions/checkout@v2 + - name: Decrypt and Extract project_env_prod + run: | + gpg --quiet --batch --yes --decrypt --passphrase="$RESQ_PASSPHRASE" --output project_env_prod.tar.gz project_env_prod.tar.gz.gpg + tar xzvf project_env_prod.tar.gz + env: + RESQ_PASSPHRASE: ${{ secrets.RESQ_PASSPHRASE }} + - name: Set up Docker uses: actions/setup-docker@v2 with: @@ -20,9 +27,9 @@ jobs: - name: Build and Push Docker Image run: | - docker build -t resq:latest -f ../../resq/backend/resq/Dockerfile.remote ../../resq/backend/resq/ + docker build -t alitpc2525/resq:latest -f ../../resq/backend/resq/Dockerfile.remote ../../resq/backend/resq/ docker login -u alitpc2525 -p ${{ secrets.DOCKER_PASSWORD }} - docker tag resq:latest alitpc2525/resq:latest + docker tag alitpc2525/resq:latest alitpc2525/resq:latest docker push alitpc2525/resq:latest - name: SSH into AWS EC2 @@ -35,5 +42,5 @@ jobs: sudo service docker start sudo docker rm -f $(sudo docker ps -q) sudo docker pull alitpc2525/resq:latest - sudo docker run -d -p 443:8081 -v /home/ec2-user/certbot/keystore.p12:/app/keystore.p12 alitpc2525/resq:latest + sudo docker run -d -p 443:8081 -v /home/ec2-user/certbot/keystore.p12:/app/keystore.p12 -v $(pwd)/project_env_prod:/app/project_env_prod alitpc2525/resq:latest sudo docker ps From 870d5c7d815c6c335ebaa4eaa3583db5edb4de7d Mon Sep 17 00:00:00 2001 From: Muhammet Ali Topcu <42305974+alitpc25@users.noreply.github.com> Date: Sat, 25 Nov 2023 05:30:06 +0300 Subject: [PATCH 2/8] Update deploy.yml Change of actions for docker setup --- .github/workflows/deploy.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index fab6dae7..4cbc447e 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -21,7 +21,7 @@ jobs: RESQ_PASSPHRASE: ${{ secrets.RESQ_PASSPHRASE }} - name: Set up Docker - uses: actions/setup-docker@v2 + uses: actions/docker-setup-buildx@v3 with: dockerfile: ../../resq/backend/resq/Dockerfile.remote From 1bcbd59a10938c1c93149b5fb388e4b034a41407 Mon Sep 17 00:00:00 2001 From: Muhammet Ali Topcu <42305974+alitpc25@users.noreply.github.com> Date: Sat, 25 Nov 2023 05:35:08 +0300 Subject: [PATCH 3/8] Update deploy.yml Updated actions and their versions --- .github/workflows/deploy.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index 4cbc447e..ea5a9b0d 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -11,7 +11,7 @@ jobs: steps: - name: Checkout Repository - uses: actions/checkout@v2 + uses: actions/checkout@v4.1.1 - name: Decrypt and Extract project_env_prod run: | @@ -21,7 +21,7 @@ jobs: RESQ_PASSPHRASE: ${{ secrets.RESQ_PASSPHRASE }} - name: Set up Docker - uses: actions/docker-setup-buildx@v3 + uses: docker/setup-buildx-action@v3.0.0 with: dockerfile: ../../resq/backend/resq/Dockerfile.remote @@ -33,7 +33,7 @@ jobs: docker push alitpc2525/resq:latest - name: SSH into AWS EC2 - uses: appleboy/ssh-action@master + uses: appleboy/ssh-action@v1.0.0 with: host: ${{ secrets.AWS_EC2_HOST }} username: ec2-user From f1da7a02c3e54c79ac2b6467960580d4130a6710 Mon Sep 17 00:00:00 2001 From: Muhammet Ali Topcu <42305974+alitpc25@users.noreply.github.com> Date: Sat, 25 Nov 2023 05:39:08 +0300 Subject: [PATCH 4/8] Update deploy.yml Updated the directory for project_env_prod.tar.gz --- .github/workflows/deploy.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index ea5a9b0d..5347e684 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -15,8 +15,8 @@ jobs: - name: Decrypt and Extract project_env_prod run: | - gpg --quiet --batch --yes --decrypt --passphrase="$RESQ_PASSPHRASE" --output project_env_prod.tar.gz project_env_prod.tar.gz.gpg - tar xzvf project_env_prod.tar.gz + gpg --quiet --batch --yes --decrypt --passphrase="$RESQ_PASSPHRASE" --output ../../resq/backend/resq/project_env_prod.tar.gz ../../resq/backend/resq/project_env_prod.tar.gz.gpg + tar xzvf ../../resq/backend/resq/project_env_prod.tar.gz env: RESQ_PASSPHRASE: ${{ secrets.RESQ_PASSPHRASE }} From ceeb74235e40b6c4524e3fe8f7c2e4a31a86ec25 Mon Sep 17 00:00:00 2001 From: Muhammet Ali Topcu <42305974+alitpc25@users.noreply.github.com> Date: Sat, 25 Nov 2023 05:43:50 +0300 Subject: [PATCH 5/8] Update deploy.yml Updated the decrypted file name --- .github/workflows/deploy.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index 5347e684..623b593f 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -16,7 +16,7 @@ jobs: - name: Decrypt and Extract project_env_prod run: | gpg --quiet --batch --yes --decrypt --passphrase="$RESQ_PASSPHRASE" --output ../../resq/backend/resq/project_env_prod.tar.gz ../../resq/backend/resq/project_env_prod.tar.gz.gpg - tar xzvf ../../resq/backend/resq/project_env_prod.tar.gz + tar xzvf ../../resq/backend/resq/project_env_prod.tar.gz -C project_env_prod env: RESQ_PASSPHRASE: ${{ secrets.RESQ_PASSPHRASE }} From e4bdaf540b8bdff242920e21ae4404ccb758ae6c Mon Sep 17 00:00:00 2001 From: Muhammet Ali Topcu <42305974+alitpc25@users.noreply.github.com> Date: Sat, 25 Nov 2023 05:49:10 +0300 Subject: [PATCH 6/8] Update deploy.yml Last try with cd :( --- .github/workflows/deploy.yml | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index 623b593f..73d0f4cc 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -15,19 +15,21 @@ jobs: - name: Decrypt and Extract project_env_prod run: | - gpg --quiet --batch --yes --decrypt --passphrase="$RESQ_PASSPHRASE" --output ../../resq/backend/resq/project_env_prod.tar.gz ../../resq/backend/resq/project_env_prod.tar.gz.gpg - tar xzvf ../../resq/backend/resq/project_env_prod.tar.gz -C project_env_prod + cd bounswe2023group1/resq/backend/resq/ + gpg --quiet --batch --yes --decrypt --passphrase="$RESQ_PASSPHRASE" --output project_env_prod.tar.gz project_env_prod.tar.gz.gpg + tar xzvf project_env_prod.tar.gz -C project_env_prod env: RESQ_PASSPHRASE: ${{ secrets.RESQ_PASSPHRASE }} - name: Set up Docker uses: docker/setup-buildx-action@v3.0.0 with: - dockerfile: ../../resq/backend/resq/Dockerfile.remote + dockerfile: Dockerfile.remote - name: Build and Push Docker Image run: | - docker build -t alitpc2525/resq:latest -f ../../resq/backend/resq/Dockerfile.remote ../../resq/backend/resq/ + cd bounswe2023group1/resq/backend/resq/ + docker build -t alitpc2525/resq:latest -f Dockerfile.remote . docker login -u alitpc2525 -p ${{ secrets.DOCKER_PASSWORD }} docker tag alitpc2525/resq:latest alitpc2525/resq:latest docker push alitpc2525/resq:latest From 83276c32075b708272669ea9a299420ec9ebb433 Mon Sep 17 00:00:00 2001 From: Muhammet Ali Topcu <42305974+alitpc25@users.noreply.github.com> Date: Sat, 25 Nov 2023 05:53:10 +0300 Subject: [PATCH 7/8] Update deploy.yml run ls and find src to see where am i --- .github/workflows/deploy.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index 73d0f4cc..53fc31e2 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -15,6 +15,8 @@ jobs: - name: Decrypt and Extract project_env_prod run: | + ls + find src cd bounswe2023group1/resq/backend/resq/ gpg --quiet --batch --yes --decrypt --passphrase="$RESQ_PASSPHRASE" --output project_env_prod.tar.gz project_env_prod.tar.gz.gpg tar xzvf project_env_prod.tar.gz -C project_env_prod From 126bb3a5c3f5ee1c42ccf7265db4ff97b79888b4 Mon Sep 17 00:00:00 2001 From: Muhammet Ali Topcu <42305974+alitpc25@users.noreply.github.com> Date: Sat, 25 Nov 2023 05:54:58 +0300 Subject: [PATCH 8/8] Update deploy.yml I learnt where am i and fixed for the first part probably --- .github/workflows/deploy.yml | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index 53fc31e2..cd31c78a 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -15,9 +15,7 @@ jobs: - name: Decrypt and Extract project_env_prod run: | - ls - find src - cd bounswe2023group1/resq/backend/resq/ + cd ./resq/backend/resq/ gpg --quiet --batch --yes --decrypt --passphrase="$RESQ_PASSPHRASE" --output project_env_prod.tar.gz project_env_prod.tar.gz.gpg tar xzvf project_env_prod.tar.gz -C project_env_prod env: @@ -30,6 +28,7 @@ jobs: - name: Build and Push Docker Image run: | + ls cd bounswe2023group1/resq/backend/resq/ docker build -t alitpc2525/resq:latest -f Dockerfile.remote . docker login -u alitpc2525 -p ${{ secrets.DOCKER_PASSWORD }}