From d97dbed6ef9ea8f450052796ff497bffb937febb Mon Sep 17 00:00:00 2001 From: Evgeny Agafonov Date: Mon, 13 Mar 2023 16:52:32 +0300 Subject: [PATCH 1/7] Update and rename docker-compose.map-envs.gha.yml to docker-compose.gha.yml --- docker-compose.gha.yml | 46 +++++++++++++++++++++++++++++++++ docker-compose.map-envs.gha.yml | 23 ----------------- 2 files changed, 46 insertions(+), 23 deletions(-) create mode 100644 docker-compose.gha.yml delete mode 100644 docker-compose.map-envs.gha.yml diff --git a/docker-compose.gha.yml b/docker-compose.gha.yml new file mode 100644 index 0000000..723878a --- /dev/null +++ b/docker-compose.gha.yml @@ -0,0 +1,46 @@ +x-uffizzi: + ingress: + service: proxy + port: 80 + continuous_previews: + delete_preview_after: 1h + +services: + db: + image: mcr.microsoft.com/mssql/server:2017-latest + deploy: + resources: + limits: + memory: 2000M + environment: + DATABASE_USERNAME: sa + MSSQL_SA_PASSWORD: 3BnLW7yFxdT + ACCEPT_EULA: Y + volumes: + - db_data:/var/opt/mssql + + proxy: + image: registry.uffizzi.com/e9b8c800-dab6-4c4f-b06a-7302411c022b:24h + depends_on: + - app + + app: + image: registry.uffizzi.com/beeb713b-da02-40b3-bde4-f84742071873:24h + deploy: + resources: + limits: + memory: 500M + depends_on: + - db + +environment: + DATABASE_HOST: db + DB_NAME: innpact_preview + DATABASE_USERNAME: sa + PRINTING_USE_LOCAL_CONFIG: 0 + RAILS_LOG_TO_STDOUT: 1 + SA_PASSWORD: LW7yFxdT + SECRET_KEY_BASE: 417b7e343df1fe95c58f1786c89f7a0b445 + +volumes: + db_data: diff --git a/docker-compose.map-envs.gha.yml b/docker-compose.map-envs.gha.yml deleted file mode 100644 index d318b54..0000000 --- a/docker-compose.map-envs.gha.yml +++ /dev/null @@ -1,23 +0,0 @@ -version: '3' - -services: - app: - image: ttl.sh/test-node-zipofar:9h - entrypoint: /bin/bash - command: - - "-c" - - "REDIRECT_URL=$$UFFIZZI_URL/home ENDPOINT=$$UFFIZZI_URL/entrypoint node /app/app/app.js" - -x-uffizzi: - ingress: - service: app - port: 8080 - additional_subdomains: - - "example-1" - - "example-2" - - "example-3" - - "example-4" - - - continuous_preview: - delete_preview_after: 10h From cb668cb428b3ddfea3c2d069006998c3757d37e0 Mon Sep 17 00:00:00 2001 From: Evgeny Agafonov Date: Mon, 13 Mar 2023 16:53:54 +0300 Subject: [PATCH 2/7] Update uffizzi-previews.yml --- .github/workflows/uffizzi-previews.yml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/uffizzi-previews.yml b/.github/workflows/uffizzi-previews.yml index 93c5edb..f48909e 100644 --- a/.github/workflows/uffizzi-previews.yml +++ b/.github/workflows/uffizzi-previews.yml @@ -13,17 +13,17 @@ jobs: runs-on: ubuntu-latest outputs: compose-file-cache-key: ${{ steps.hash.outputs.hash }} - compose-file-cache-path: docker-compose.map-envs.gha.yml + compose-file-cache-path: docker-compose.gha.yml steps: - name: Checkout git repo uses: actions/checkout@v3 - name: Hash Rendered Compose File id: hash - run: echo "::set-output name=hash::$(md5sum docker-compose.map-envs.gha.yml | awk '{ print $1 }')" + run: echo "::set-output name=hash::$(md5sum docker-compose.gha.yml | awk '{ print $1 }')" - name: Cache Rendered Compose File uses: actions/cache@v3 with: - path: docker-compose.map-envs.gha.yml + path: docker-compose.gha.yml key: ${{ steps.hash.outputs.hash }} deploy-uffizzi-preview: @@ -34,8 +34,8 @@ jobs: if: ${{ github.event_name == 'pull_request' && github.event.action != 'closed' }} with: compose-file-cache-key: ${{ needs.render-compose-file.outputs.compose-file-cache-key }} - compose-file-cache-path: docker-compose.map-envs.gha.yml - server: https://app.uffizzi.com/ + compose-file-cache-path: docker-compose.gha.yml + server: https://pr-905-deployment-18808-uffizzi-platform.app.uffizzi.com/ permissions: contents: read pull-requests: write From d480840d49fb7c21ac35a06c8f941b8c6cbfac42 Mon Sep 17 00:00:00 2001 From: Evgeny Agafonov Date: Mon, 13 Mar 2023 17:04:50 +0300 Subject: [PATCH 3/7] Update docker-compose.gha.yml --- docker-compose.gha.yml | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/docker-compose.gha.yml b/docker-compose.gha.yml index 723878a..2d2c154 100644 --- a/docker-compose.gha.yml +++ b/docker-compose.gha.yml @@ -17,21 +17,23 @@ services: MSSQL_SA_PASSWORD: 3BnLW7yFxdT ACCEPT_EULA: Y volumes: - - db_data:/var/opt/mssql + - db_data:/var/opt/mssql proxy: - image: registry.uffizzi.com/e9b8c800-dab6-4c4f-b06a-7302411c022b:24h + # image: registry.uffizzi.com/e9b8c800-dab6-4c4f-b06a-7302411c022b:24h + image: nginx depends_on: - - app + - app app: - image: registry.uffizzi.com/beeb713b-da02-40b3-bde4-f84742071873:24h + # image: registry.uffizzi.com/beeb713b-da02-40b3-bde4-f84742071873:24h + image: redis deploy: resources: limits: memory: 500M depends_on: - - db + - db environment: DATABASE_HOST: db From 8e4c48e79f559b6377efab3e88393ab9f3cda3ec Mon Sep 17 00:00:00 2001 From: Evgeny Agafonov Date: Mon, 13 Mar 2023 17:13:04 +0300 Subject: [PATCH 4/7] Update docker-compose.gha.yml --- docker-compose.gha.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker-compose.gha.yml b/docker-compose.gha.yml index 2d2c154..b38e3f9 100644 --- a/docker-compose.gha.yml +++ b/docker-compose.gha.yml @@ -27,7 +27,7 @@ services: app: # image: registry.uffizzi.com/beeb713b-da02-40b3-bde4-f84742071873:24h - image: redis + image: redis:j deploy: resources: limits: From 09c5ba25458e339d93740234cf6c370259c1ffc7 Mon Sep 17 00:00:00 2001 From: Evgeny Agafonov Date: Mon, 20 Mar 2023 19:26:55 +0300 Subject: [PATCH 5/7] Update docker-compose.gha.yml --- docker-compose.gha.yml | 44 ++---------------------------------------- 1 file changed, 2 insertions(+), 42 deletions(-) diff --git a/docker-compose.gha.yml b/docker-compose.gha.yml index b38e3f9..2e10e70 100644 --- a/docker-compose.gha.yml +++ b/docker-compose.gha.yml @@ -1,48 +1,8 @@ x-uffizzi: ingress: - service: proxy + service: app port: 80 - continuous_previews: - delete_preview_after: 1h services: - db: - image: mcr.microsoft.com/mssql/server:2017-latest - deploy: - resources: - limits: - memory: 2000M - environment: - DATABASE_USERNAME: sa - MSSQL_SA_PASSWORD: 3BnLW7yFxdT - ACCEPT_EULA: Y - volumes: - - db_data:/var/opt/mssql - - proxy: - # image: registry.uffizzi.com/e9b8c800-dab6-4c4f-b06a-7302411c022b:24h - image: nginx - depends_on: - - app - app: - # image: registry.uffizzi.com/beeb713b-da02-40b3-bde4-f84742071873:24h - image: redis:j - deploy: - resources: - limits: - memory: 500M - depends_on: - - db - -environment: - DATABASE_HOST: db - DB_NAME: innpact_preview - DATABASE_USERNAME: sa - PRINTING_USE_LOCAL_CONFIG: 0 - RAILS_LOG_TO_STDOUT: 1 - SA_PASSWORD: LW7yFxdT - SECRET_KEY_BASE: 417b7e343df1fe95c58f1786c89f7a0b445 - -volumes: - db_data: + image: nginx From dd03f5de9d81847f8cbf56d7615928cd8f81543d Mon Sep 17 00:00:00 2001 From: Evgeny Agafonov Date: Mon, 20 Mar 2023 19:27:15 +0300 Subject: [PATCH 6/7] Update uffizzi-previews.yml --- .github/workflows/uffizzi-previews.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/uffizzi-previews.yml b/.github/workflows/uffizzi-previews.yml index f48909e..9018582 100644 --- a/.github/workflows/uffizzi-previews.yml +++ b/.github/workflows/uffizzi-previews.yml @@ -35,7 +35,7 @@ jobs: with: compose-file-cache-key: ${{ needs.render-compose-file.outputs.compose-file-cache-key }} compose-file-cache-path: docker-compose.gha.yml - server: https://pr-905-deployment-18808-uffizzi-platform.app.uffizzi.com/ + server: https://pr-923-deployment-19590-uffizzi-platform.app.uffizzi.com/ permissions: contents: read pull-requests: write From 8b4695f261cbb0bfdc2c935551a78eb8604b582b Mon Sep 17 00:00:00 2001 From: Evgeny Agafonov Date: Thu, 27 Apr 2023 18:47:24 +0300 Subject: [PATCH 7/7] Update uffizzi-previews.yml --- .github/workflows/uffizzi-previews.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/uffizzi-previews.yml b/.github/workflows/uffizzi-previews.yml index 9018582..43a023c 100644 --- a/.github/workflows/uffizzi-previews.yml +++ b/.github/workflows/uffizzi-previews.yml @@ -35,7 +35,7 @@ jobs: with: compose-file-cache-key: ${{ needs.render-compose-file.outputs.compose-file-cache-key }} compose-file-cache-path: docker-compose.gha.yml - server: https://pr-923-deployment-19590-uffizzi-platform.app.uffizzi.com/ + server: https://e1b7-95-54-231-131.ngrok-free.app permissions: contents: read pull-requests: write