From 02048fef359f91e97156be07b4db7b8134a370ee Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miko=20Keskim=C3=A4ki?= Date: Mon, 26 Jun 2023 15:29:46 +0300 Subject: [PATCH] Move to using openshift container registry for test images --- .github/actions/run-tests/action.yaml | 2 +- .github/workflows/test.yaml | 8 ++++---- .github/workflows/updater.yaml | 2 +- anonyymioodi/commit_and_push_to_toska_hub.sh | 4 ++-- anonyymioodi/docker-compose.yml | 8 ++++---- docker-compose.ci.yml | 15 ++++++--------- docker-compose.yml | 8 ++++---- 7 files changed, 22 insertions(+), 25 deletions(-) diff --git a/.github/actions/run-tests/action.yaml b/.github/actions/run-tests/action.yaml index 3cac3925f..916754337 100644 --- a/.github/actions/run-tests/action.yaml +++ b/.github/actions/run-tests/action.yaml @@ -18,7 +18,7 @@ runs: - name: 'Login to toska Docker registry' uses: docker/login-action@v2 with: - registry: registry.toska.cs.helsinki.fi + registry: registry-toska.ext.ocp-prod-0.k8s.it.helsinki.fi username: ${{ inputs.username }} password: ${{ inputs.password }} diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml index a7d2579dc..5e6bc1b7b 100644 --- a/.github/workflows/test.yaml +++ b/.github/workflows/test.yaml @@ -77,7 +77,7 @@ jobs: - name: 'Login to toska docker registry' uses: docker/login-action@v2 with: - registry: registry.toska.cs.helsinki.fi + registry: registry-toska.ext.ocp-prod-0.k8s.it.helsinki.fi username: ${{ secrets.username }} password: ${{ secrets.password }} - name: 'Let sis-updater-worker run migrations, then push new version of image to toska hub' @@ -110,7 +110,7 @@ jobs: - name: 'Login to toska docker registry' uses: docker/login-action@v2 with: - registry: registry.toska.cs.helsinki.fi + registry: registry-toska.ext.ocp-prod-0.k8s.it.helsinki.fi username: ${{ secrets.username }} password: ${{ secrets.password }} - name: 'Let backend run migrations, then push new version of image to toska hub' @@ -143,7 +143,7 @@ jobs: - name: 'Login to toska docker registry' uses: docker/login-action@v2 with: - registry: registry.toska.cs.helsinki.fi + registry: registry-toska.ext.ocp-prod-0.k8s.it.helsinki.fi username: ${{ secrets.username }} password: ${{ secrets.password }} - name: 'Let backend run migrations, then push new version of image to toska hub' @@ -329,7 +329,7 @@ jobs: - name: 'Login to toska docker registry' uses: docker/login-action@v2 with: - registry: registry.toska.cs.helsinki.fi + registry: registry-toska.ext.ocp-prod-0.k8s.it.helsinki.fi username: ${{ secrets.username }} password: ${{ secrets.password }} diff --git a/.github/workflows/updater.yaml b/.github/workflows/updater.yaml index 797b7d45a..c76c38a4f 100644 --- a/.github/workflows/updater.yaml +++ b/.github/workflows/updater.yaml @@ -57,7 +57,7 @@ jobs: - name: 'Login to toska docker registry' uses: docker/login-action@v2 with: - registry: registry.toska.cs.helsinki.fi + registry: registry-toska.ext.ocp-prod-0.k8s.it.helsinki.fi username: ${{ secrets.TOSKAREGISTRY_USERNAME }} password: ${{ secrets.TOSKAREGISTRY_PASSWORD }} - name: 'Download built images' diff --git a/anonyymioodi/commit_and_push_to_toska_hub.sh b/anonyymioodi/commit_and_push_to_toska_hub.sh index 00ad94e0d..36a628c8d 100755 --- a/anonyymioodi/commit_and_push_to_toska_hub.sh +++ b/anonyymioodi/commit_and_push_to_toska_hub.sh @@ -43,6 +43,6 @@ fi infomsg "Committing and pushing to registry" database=${args[0]} -docker commit "$database" "registry.toska.cs.helsinki.fi/$database" -docker push "registry.toska.cs.helsinki.fi/$database" +docker commit "$database" "registry-toska.ext.ocp-prod-0.k8s.it.helsinki.fi/$database" +docker push "registry-toska.ext.ocp-prod-0.k8s.it.helsinki.fi/$database" successmsg "Succesfully pushed" diff --git a/anonyymioodi/docker-compose.yml b/anonyymioodi/docker-compose.yml index fd9ab2cbc..5f5cdd75d 100644 --- a/anonyymioodi/docker-compose.yml +++ b/anonyymioodi/docker-compose.yml @@ -9,7 +9,7 @@ services: PGDATA: /data POSTGRES_DB: kone-db POSTGRES_HOST_AUTH_METHOD: trust - image: registry.toska.cs.helsinki.fi/kone-db + image: registry-toska.ext.ocp-prod-0.k8s.it.helsinki.fi/kone-db # image: postgres:13.4-alpine profiles: - oodikone @@ -21,7 +21,7 @@ services: PGDATA: /data POSTGRES_DB: sis-db POSTGRES_HOST_AUTH_METHOD: trust - # image: registry.toska.cs.helsinki.fi/sis-db + # image: registry-toska.ext.ocp-prod-0.k8s.it.helsinki.fi/sis-db image: postgres:13.2 shm_size: 2gb @@ -32,7 +32,7 @@ services: PGDATA: /data POSTGRES_DB: sis-importer-db POSTGRES_HOST_AUTH_METHOD: trust - # image: registry.toska.cs.helsinki.fi/sis-importer-db + # image: registry-toska.ext.ocp-prod-0.k8s.it.helsinki.fi/sis-importer-db image: postgres:13.1 profiles: - updater @@ -44,7 +44,7 @@ services: PGDATA: /data POSTGRES_DB: user-db POSTGRES_HOST_AUTH_METHOD: trust - image: registry.toska.cs.helsinki.fi/user-db + image: registry-toska.ext.ocp-prod-0.k8s.it.helsinki.fi/user-db # image: postgres:13.4-alpine profiles: - oodikone diff --git a/docker-compose.ci.yml b/docker-compose.ci.yml index c603a8c88..a8957f9c6 100644 --- a/docker-compose.ci.yml +++ b/docker-compose.ci.yml @@ -37,7 +37,7 @@ services: PGDATA: /data POSTGRES_DB: kone-db POSTGRES_HOST_AUTH_METHOD: trust - image: registry.toska.cs.helsinki.fi/kone-db + image: registry-toska.ext.ocp-prod-0.k8s.it.helsinki.fi/kone-db redis: <<: *defaults @@ -50,7 +50,7 @@ services: sis-db: <<: *defaults container_name: sis-db - image: registry.toska.cs.helsinki.fi/sis-db + image: registry-toska.ext.ocp-prod-0.k8s.it.helsinki.fi/sis-db environment: PGDATA: /data POSTGRES_DB: sis-db @@ -64,18 +64,15 @@ services: PGDATA: /data POSTGRES_DB: user-db POSTGRES_HOST_AUTH_METHOD: trust - image: registry.toska.cs.helsinki.fi/user-db + image: registry-toska.ext.ocp-prod-0.k8s.it.helsinki.fi/user-db jami: <<: *defaults - image: toska/jami + image: quay.io/toska/jami:production environment: - PORT=3003 - NODE_ENV=production - - POSTGRES_HOST=jami-db - - POSTGRES_USER=postgres - - POSTGRES_PASSWORD=postgres - - POSTGRES_DATABASE=postgres + - DATABASE_URL=postgres://postgres:postgres@jami-db:5432/postgres ports: - 3003:3003 container_name: jami @@ -105,7 +102,7 @@ services: sis-importer-db: <<: *defaults container_name: sis-importer-db - image: registry.toska.cs.helsinki.fi/sis-importer-db + image: registry-toska.ext.ocp-prod-0.k8s.it.helsinki.fi/sis-importer-db profiles: - updater diff --git a/docker-compose.yml b/docker-compose.yml index e25025f59..326c8b408 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -66,7 +66,7 @@ services: kone-db: <<: *defaults container_name: kone-db - image: registry.toska.cs.helsinki.fi/kone-db + image: registry-toska.ext.ocp-prod-0.k8s.it.helsinki.fi/kone-db profiles: - oodikone volumes: @@ -85,7 +85,7 @@ services: sis-db: <<: *defaults container_name: sis-db - image: registry.toska.cs.helsinki.fi/sis-db + image: registry-toska.ext.ocp-prod-0.k8s.it.helsinki.fi/sis-db volumes: - sis-db-data:/data shm_size: 2gb @@ -93,7 +93,7 @@ services: sis-importer-db: <<: *defaults container_name: sis-importer-db - image: registry.toska.cs.helsinki.fi/sis-importer-db + image: registry-toska.ext.ocp-prod-0.k8s.it.helsinki.fi/sis-importer-db profiles: - updater volumes: @@ -164,7 +164,7 @@ services: user-db: <<: *defaults container_name: user-db - image: registry.toska.cs.helsinki.fi/user-db + image: registry-toska.ext.ocp-prod-0.k8s.it.helsinki.fi/user-db profiles: - oodikone volumes: