From 57c996e0305a2d575d3c6f8de9998a08a2f0c90a Mon Sep 17 00:00:00 2001 From: montaghanmy Date: Fri, 31 Mar 2023 10:04:20 +0100 Subject: [PATCH] fix: renamed ci docker image to tdrive --- .github/workflows/docker.yml | 10 ++------ .github/workflows/integration-test.yml | 2 +- .github/workflows/saas-update-backend.yml | 31 ++--------------------- .github/workflows/saas-update-front.yml | 4 +-- 4 files changed, 7 insertions(+), 40 deletions(-) diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml index df35083d..b67130d7 100644 --- a/.github/workflows/docker.yml +++ b/.github/workflows/docker.yml @@ -11,16 +11,10 @@ jobs: runs-on: ubuntu-20.04 steps: - uses: actions/checkout@v2 - - run: cd twake && docker build -t twaketech/twake-nginx -f docker/twake-nginx/Dockerfile . - - build-php: - runs-on: ubuntu-20.04 - steps: - - uses: actions/checkout@v2 - - run: cd twake && docker build -t twaketech/twake-php -f docker/twake-php/Dockerfile . + - run: cd twake && docker build -t twaketech/tdrive-nginx -f docker/twake-nginx/Dockerfile . build-node: runs-on: ubuntu-20.04 steps: - uses: actions/checkout@v2 - - run: cd twake && docker build --target production -t twaketech/twake-node -f docker/twake-node/Dockerfile . + - run: cd twake && docker build --target production -t twaketech/tdrive-node -f docker/twake-node/Dockerfile . diff --git a/.github/workflows/integration-test.yml b/.github/workflows/integration-test.yml index 2ee4d748..743920f6 100644 --- a/.github/workflows/integration-test.yml +++ b/.github/workflows/integration-test.yml @@ -14,7 +14,7 @@ jobs: - name: build run: cd twake && docker build -t integration-test -f docker/integration-test/Dockerfile . - name: build-node - run: cd twake && docker build -t twaketech/twake-node -f docker/twake-node/Dockerfile . + run: cd twake && docker build -t twaketech/tdrive-node -f docker/twake-node/Dockerfile . - name: run-twake-instance run: cd twake && docker-compose -f docker-compose.onpremise.mongo.yml up -d && sleep 60 - name: get-logs diff --git a/.github/workflows/saas-update-backend.yml b/.github/workflows/saas-update-backend.yml index c11485a8..17646196 100644 --- a/.github/workflows/saas-update-backend.yml +++ b/.github/workflows/saas-update-backend.yml @@ -10,33 +10,6 @@ on: - ".github/workflows/**" jobs: - deploy-php: - runs-on: ubuntu-20.04 - steps: - - run: 'echo "DOCKERTAGVERSION=2023.Q1.1223" >> $GITHUB_ENV' - - name: Set env to develop - if: endsWith(github.ref, '/develop') - run: 'echo "DOCKERTAG=develop" >> $GITHUB_ENV; echo "DOCKERTAGVERSION=2023.Q1.1223" >> $GITHUB_ENV' - - name: Set env to develop - if: endsWith(github.ref, '/qa') - run: 'echo "DOCKERTAG=qa" >> $GITHUB_ENV; echo "DOCKERTAGVERSION=2023.Q1.1223" >> $GITHUB_ENV' - - name: Set env to develop - if: endsWith(github.ref, '/canary') - run: 'echo "DOCKERTAG=canary" >> $GITHUB_ENV; echo "DOCKERTAGVERSION=${{ env.DOCKERTAGVERSION }}-canary" >> $GITHUB_ENV' - - name: Set env to production - if: endsWith(github.ref, '/main') - run: 'echo "DOCKERTAG=latest" >> $GITHUB_ENV' - - uses: actions/checkout@v2 - - name: Publish to Registry - uses: elgohr/Publish-Docker-Github-Action@master - with: - name: twaketech/twake-php - username: ${{ secrets.DOCKER_USERNAME }} - password: ${{ secrets.DOCKER_PASSWORD }} - workdir: twake - buildoptions: "-t twaketech/twake-php -f docker/twake-php/Dockerfile" - tags: "${{ env.DOCKERTAG }},${{ env.DOCKERTAGVERSION }}" - deploy-node: runs-on: ubuntu-20.04 steps: @@ -57,11 +30,11 @@ jobs: - name: Publish to Registry uses: elgohr/Publish-Docker-Github-Action@master with: - name: twaketech/twake-node + name: twaketech/tdrive-node username: ${{ secrets.DOCKER_USERNAME }} password: ${{ secrets.DOCKER_PASSWORD }} workdir: twake context: . target: production - buildoptions: "-t twaketech/twake-node -f docker/twake-node/Dockerfile" + buildoptions: "-t twaketech/tdrive-node -f docker/twake-node/Dockerfile" tags: "${{ env.DOCKERTAG }},${{ env.DOCKERTAGVERSION }}" diff --git a/.github/workflows/saas-update-front.yml b/.github/workflows/saas-update-front.yml index 9f4c45c2..4f48e0a1 100644 --- a/.github/workflows/saas-update-front.yml +++ b/.github/workflows/saas-update-front.yml @@ -65,9 +65,9 @@ jobs: - name: Publish to Registry uses: elgohr/Publish-Docker-Github-Action@master with: - name: twaketech/twake-nginx + name: twaketech/tdrive-nginx username: ${{ secrets.DOCKER_USERNAME }} password: ${{ secrets.DOCKER_PASSWORD }} workdir: twake - buildoptions: "-t twaketech/twake-nginx -f docker/twake-nginx/Dockerfile" + buildoptions: "-t twaketech/tdrive-nginx -f docker/twake-nginx/Dockerfile" tags: "${{ env.DOCKERTAG }},${{ env.DOCKERTAGVERSION }}"