diff --git a/.github/workflows/api-build.yml b/.github/workflows/api-build.yml index c6827b7..01f9bcf 100644 --- a/.github/workflows/api-build.yml +++ b/.github/workflows/api-build.yml @@ -11,7 +11,7 @@ jobs: build-push-docker-image: runs-on: ubuntu-latest environment: - name: testnet + name: mainnet steps: - run: echo "🎉 The job was automatically triggered by a ${{ github.event_name }} event." - run: echo "🐧 This job is now running on a ${{ runner.os }} server hosted by GitHub!" @@ -41,7 +41,7 @@ jobs: uses: docker/build-push-action@v4 with: push: true - tags: ${{ vars.API_TESTNET_TAG }} + tags: ${{ vars.API_MAINNET_TAG }} #tags: 121427815363.dkr.ecr.ap-southeast-1.amazonaws.com/bworks:api-testnet #tags: jackchuong/itl:bworks-api-testnet context: . diff --git a/.github/workflows/api-deploy.yml b/.github/workflows/api-deploy.yml index 50abd7f..8305701 100644 --- a/.github/workflows/api-deploy.yml +++ b/.github/workflows/api-deploy.yml @@ -6,7 +6,7 @@ jobs: restart-api-service: runs-on: ubuntu-latest environment: - name: testnet + name: mainnet steps: - run: echo "🎉 The job was automatically triggered by a ${{ github.event_name }} event." - run: echo "🐧 This job is now running on a ${{ runner.os }} server hosted by GitHub!" @@ -62,7 +62,7 @@ jobs: docker-compose -f docker-compose.yml stop api docker-compose -f docker-compose.yml rm -f api cat docker-compose.template.yml > docker-compose.yml - sed -i "s|API_TESTNET_TAG|${{ vars.API_TESTNET_TAG }}|g" docker-compose.yml + sed -i "s|API_MAINNET_TAG|${{ vars.API_MAINNET_TAG }}|g" docker-compose.yml #docker rmi -f 121427815363.dkr.ecr.ap-southeast-1.amazonaws.com/bworks:api-testnet #docker rmi -f jackchuong/itl:bworks-api-testnet aws ecr get-login-password --region ap-southeast-1 | docker login --username AWS --password-stdin 121427815363.dkr.ecr.ap-southeast-1.amazonaws.com/bworks diff --git a/.github/workflows/frontend-build.yml b/.github/workflows/frontend-build.yml index a2157ca..23883fa 100644 --- a/.github/workflows/frontend-build.yml +++ b/.github/workflows/frontend-build.yml @@ -11,7 +11,7 @@ jobs: build-push-docker-image: runs-on: ubuntu-latest environment: - name: testnet + name: mainnet steps: - run: echo "🎉 The job was automatically triggered by a ${{ github.event_name }} event." - run: echo "🐧 This job is now running on a ${{ runner.os }} server hosted by GitHub!" @@ -53,7 +53,7 @@ jobs: uses: docker/build-push-action@v4 with: push: true - tags: ${{ vars.FRONTEND_TESTNET_TAG }} + tags: ${{ vars.FRONTEND_MAINNET_TAG }} #tags: 121427815363.dkr.ecr.ap-southeast-1.amazonaws.com/bworks:frontend-testnet #tags: jackchuong/itl:bworks-frontend-testnet context: . diff --git a/.github/workflows/frontend-deploy.yml b/.github/workflows/frontend-deploy.yml index ca368cf..55e1993 100644 --- a/.github/workflows/frontend-deploy.yml +++ b/.github/workflows/frontend-deploy.yml @@ -6,7 +6,7 @@ jobs: restart-api-service: runs-on: ubuntu-latest environment: - name: testnet + name: mainnet steps: - run: echo "🎉 The job was automatically triggered by a ${{ github.event_name }} event." - run: echo "🐧 This job is now running on a ${{ runner.os }} server hosted by GitHub!" @@ -22,7 +22,7 @@ jobs: docker-compose -f docker-compose.yml stop nginx docker-compose -f docker-compose.yml rm -f nginx cat docker-compose.template.yml > docker-compose.yml - sed -i "s|FRONTEND_TESTNET_TAG|${{ vars.FRONTEND_TESTNET_TAG }}|g" docker-compose.yml + sed -i "s|FRONTEND_MAINNET_TAG|${{ vars.FRONTEND_MAINNET_TAG }}|g" docker-compose.yml #docker rmi -f 121427815363.dkr.ecr.ap-southeast-1.amazonaws.com/bworks:frontend-testnet #docker rmi -f jackchuong/itl:bworks-frontend-testnet aws ecr get-login-password --region ap-southeast-1 | docker login --username AWS --password-stdin 121427815363.dkr.ecr.ap-southeast-1.amazonaws.com/bworks diff --git a/docker-configs/docker-compose.template.yml b/docker-configs/docker-compose.template.yml index a94271f..1af5f1d 100644 --- a/docker-configs/docker-compose.template.yml +++ b/docker-configs/docker-compose.template.yml @@ -25,7 +25,7 @@ services: - bworksnet nginx: - image: FRONTEND_TESTNET_TAG + image: FRONTEND_MAINNET_TAG #image: 121427815363.dkr.ecr.ap-southeast-1.amazonaws.com/bworks:frontend-testnet #image: jackchuong/itl:bworks-frontend-testnet container_name: nginx @@ -68,7 +68,7 @@ services: - bworksnet api: - image: API_TESTNET_TAG + image: API_MAINNET_TAG #image: 121427815363.dkr.ecr.ap-southeast-1.amazonaws.com/bworks:api-testnet #image: jackchuong/itl:bworks-api-testnet container_name: api diff --git a/docker-configs/nginx/conf.d/custom.conf b/docker-configs/nginx/conf.d/custom.conf index b99d84d..5b6d0ab 100644 --- a/docker-configs/nginx/conf.d/custom.conf +++ b/docker-configs/nginx/conf.d/custom.conf @@ -1,7 +1,7 @@ server { listen 80; - server_name dev.bworks.app; + server_name bworks.app; server_tokens off; location /.well-known/acme-challenge/ { @@ -9,17 +9,17 @@ server { } location / { - return 301 https://dev.bworks.app$request_uri; + return 301 https://bworks.app$request_uri; } } server { listen 443 ssl; - server_name dev.bworks.app; + server_name bworks.app; - ssl_certificate /etc/nginx/ssl/live/dev.bworks.app/fullchain.pem; - ssl_certificate_key /etc/nginx/ssl/live/dev.bworks.app/privkey.pem; + ssl_certificate /etc/nginx/ssl/live/bworks.app-0001/fullchain.pem; + ssl_certificate_key /etc/nginx/ssl/live/bworks.app-0001/privkey.pem; location /cms { root /var/www/cms; #run cms app @@ -60,7 +60,7 @@ server { server { listen 80; - server_name dev.www.bworks.app; + server_name www.bworks.app; server_tokens off; location /.well-known/acme-challenge/ { @@ -68,17 +68,17 @@ server { } location / { - return 301 https://dev.www.bworks.app$request_uri; + return 301 https://www.bworks.app$request_uri; } } server { listen 443 ssl; - server_name dev.www.bworks.app; + server_name www.bworks.app; - ssl_certificate /etc/nginx/ssl/live/dev.www.bworks.app/fullchain.pem; - ssl_certificate_key /etc/nginx/ssl/live/dev.www.bworks.app/privkey.pem; + ssl_certificate /etc/nginx/ssl/live/www.bworks.app/fullchain.pem; + ssl_certificate_key /etc/nginx/ssl/live/www.bworks.app/privkey.pem; location / { proxy_pass http://homepage:8000;