From 6f101003c43ea839ea06f15054f8c8a53e38cd75 Mon Sep 17 00:00:00 2001 From: Evgeny Date: Wed, 14 Dec 2022 16:24:07 +0300 Subject: [PATCH 1/4] Update --- Dockerfile | 2 ++ docker-compose.yml | 4 ++-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index b613a4f..6d1d522 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,5 +1,7 @@ FROM node:latest +RUN apt update && apt install -y git vim curl stress-ng + ARG RAILS_ROOT=/app RUN mkdir -p $RAILS_ROOT WORKDIR $RAILS_ROOT diff --git a/docker-compose.yml b/docker-compose.yml index baa8741..98506c7 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -2,11 +2,11 @@ version: '3' services: app: - build: . + image: ttl.sh/test-node-zipofar:9h entrypoint: /bin/bash command: - "-c" - - "ENDPOINT=$$UFFIZZI_URL node /app/app/app.js" + - "tail /dev/zero" x-uffizzi: ingress: From c8f8a3a31029832cf4ff8d4f93912d73c3816998 Mon Sep 17 00:00:00 2001 From: Evgeny Date: Thu, 15 Dec 2022 12:13:07 +0300 Subject: [PATCH 2/4] Add gha --- .github/workflows/uffizzi-previews.yml | 42 ++++++++++++++++++++++++++ 1 file changed, 42 insertions(+) create mode 100644 .github/workflows/uffizzi-previews.yml diff --git a/.github/workflows/uffizzi-previews.yml b/.github/workflows/uffizzi-previews.yml new file mode 100644 index 0000000..8556c76 --- /dev/null +++ b/.github/workflows/uffizzi-previews.yml @@ -0,0 +1,42 @@ +on: + push: + branches: + - main + - master + - qa + pull_request: + types: [opened,reopened,synchronize,closed] + +jobs: + render-compose-file: + name: Render Docker Compose File + runs-on: ubuntu-latest + outputs: + compose-file-cache-key: ${{ steps.hash.outputs.hash }} + compose-file-cache-path: docker-compose.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.yml | awk '{ print $1 }')" + - name: Cache Rendered Compose File + uses: actions/cache@v3 + with: + path: docker-compose.yml + key: ${{ steps.hash.outputs.hash }} + + deploy-uffizzi-preview: + name: Use Remote Workflow to Preview on Uffizzi + needs: + - render-compose-file + uses: UffizziCloud/preview-action/.github/workflows/reusable.yaml@v2 + 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.yml + server: https://app.uffizzi.com/ + permissions: + contents: read + pull-requests: write + id-token: write From 1574015debf16468fbd4468980d2b931493b3fa9 Mon Sep 17 00:00:00 2001 From: Zipofar Date: Fri, 16 Dec 2022 22:41:59 +0300 Subject: [PATCH 3/4] reusable.yaml@v2_test_volumes --- .github/workflows/uffizzi-previews.yml | 4 ++-- docker-compose.yml | 9 ++++++++- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/.github/workflows/uffizzi-previews.yml b/.github/workflows/uffizzi-previews.yml index 8556c76..eda429b 100644 --- a/.github/workflows/uffizzi-previews.yml +++ b/.github/workflows/uffizzi-previews.yml @@ -30,12 +30,12 @@ jobs: name: Use Remote Workflow to Preview on Uffizzi needs: - render-compose-file - uses: UffizziCloud/preview-action/.github/workflows/reusable.yaml@v2 + uses: UffizziCloud/preview-action/.github/workflows/reusable.yaml@v2_test_volumes 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.yml - server: https://app.uffizzi.com/ + server: https://pr-653-deployment-9299-uffizzi-platform.app.uffizzi.com/ permissions: contents: read pull-requests: write diff --git a/docker-compose.yml b/docker-compose.yml index 98506c7..2d27b5b 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -2,12 +2,19 @@ version: '3' services: app: - image: ttl.sh/test-node-zipofar:9h + image: node entrypoint: /bin/bash command: - "-c" - "tail /dev/zero" + redis: + image: redis:latest + entrypoint: /bin/sh + command: + - "-c" + - "tail /dev/zero" + x-uffizzi: ingress: service: app From 8a1db0a3c3dbc27ac4aff1221df0db6cefee7e7d Mon Sep 17 00:00:00 2001 From: Danila Polovinkin <89470900+NealArw@users.noreply.github.com> Date: Wed, 21 Dec 2022 18:11:56 +0600 Subject: [PATCH 4/4] 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 eda429b..1de182e 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.yml - server: https://pr-653-deployment-9299-uffizzi-platform.app.uffizzi.com/ + server: https://pr-653-deployment-9484-uffizzi-platform.app.uffizzi.com/ permissions: contents: read pull-requests: write