chore(OracleRunParallel.yml): update Docker login credentials to use …

…new repository URL and credentials chore(advanced.yml, main.yml): update environment variables to use new repository URL and credentials chore(create-infra.sh): update Docker login command to use new repository URL and credentials chore(docker-compose.edb.yml): update image URLs to point to new repository URL chore(oracle-artifactory/docker-compose.yml): update image URL to point to new repository URL
liquibase · May 14, 2024 · 35fed9c · 35fed9c
1 parent b7542b3
commit 35fed9c
Show file tree

Hide file tree

Showing 6 changed files with 23 additions and 23 deletions.
diff --git a/.github/workflows/OracleRunParallel.yml b/.github/workflows/OracleRunParallel.yml
@@ -31,7 +31,7 @@ jobs:
           cache: 'maven'
 
       - name: Docker login to retrive Oracle images from private repo
-        run: docker login "${{ secrets.ARTIFACTORY_URL }}" -u "${{ secrets.ARTIFACTORY_USER }}" -p "${{ secrets.ARTIFACTORY_TOKEN }}"
+        run: docker login "${{ secrets.REPO_URL }}" -u "${{ secrets.REPO_USER }}" -p "${{ secrets.REPO_PASSWORD }}"
 
       - name: Build Oracle Artifactory test infra
         if: ${{ matrix.plan == '19.3.0' }}

diff --git a/.github/workflows/advanced.yml b/.github/workflows/advanced.yml
@@ -206,9 +206,9 @@ jobs:
         working-directory: src/test/resources/docker
         run: ./create-infra.sh ${{ matrix.database }}
         env:
-          ARTIFACTORY_URL: ${{ secrets.ARTIFACTORY_URL }}
-          ARTIFACTORY_USER: ${{ secrets.ARTIFACTORY_USER }}
-          ARTIFACTORY_TOKEN: ${{ secrets.ARTIFACTORY_TOKEN }}
+          REPO_URL: ${{ secrets.REPO_URL }}
+          REPO_USER: ${{ secrets.REPO_USER }}
+          REPO_PASSWORD: ${{ secrets.REPO_PASSWORD }}
 
       - name: Configure Liquibase Version
         if: needs.setup.outputs.useLiquibaseSnapshot == 'true'

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -306,9 +306,9 @@ jobs:
         working-directory: src/test/resources/docker
         run: ./create-infra.sh ${{ matrix.database }}
         env:
-          ARTIFACTORY_URL: ${{ secrets.ARTIFACTORY_URL }}
-          ARTIFACTORY_USER: ${{ secrets.ARTIFACTORY_USER }}
-          ARTIFACTORY_TOKEN: ${{ secrets.ARTIFACTORY_TOKEN }}
+          REPO_URL: ${{ secrets.REPO_URL }}
+          REPO_USER: ${{ secrets.REPO_USER }}
+          REPO_PASSWORD: ${{ secrets.REPO_PASSWORD }}
 
       - name: Configure Liquibase Version
         env:

diff --git a/src/test/resources/docker/create-infra.sh b/src/test/resources/docker/create-infra.sh
@@ -14,7 +14,7 @@ case $db in
 
   # edb setup requires login to private registry
   "edb-postgres-9.5"|"edb-postgres-9.6"|"edb-postgres-10"|"edb-postgres-11"|"edb-postgres-12"|"edb-postgres-13"|"edb-postgres-14"|"edb-edb-9.5"|"edb-edb-9.6"|"edb-edb-10"|"edb-edb-11"|"edb-edb-12"|"edb-edb-13"|"edb-edb-14")
-    docker login $ARTIFACTORY_URL -u $ARTIFACTORY_USER -p $ARTIFACTORY_TOKEN
+    docker login $REPO_URL -u $REPO_USER -p $REPO_PASSWORD
     docker compose -f docker-compose.edb.yml up -d $db
     exit 0
     ;;

diff --git a/src/test/resources/docker/docker-compose.edb.yml b/src/test/resources/docker/docker-compose.edb.yml
@@ -5,49 +5,49 @@ services:
   # Liquibase hosts private EDB images built for testing purposes in a private Artifactory repo which is login protected. 
   # If you do not login privileges to this private repo then you will encounter authentication errors if you run `docker compose up` on this docker compose file.
   edb-postgres-9.5:
-    image: docker-dev.artifactory.datical.net/datical/datical-enterprisedb-ppas95:latest
+    image: docker.liquibase.net/datical-enterprisedb-ppas95:latest
     ports:
       - "5501:5444"
     restart: always
     # no environment or volumes as those were created at image creation
 
   edb-postgres-9.6:
-    image: docker-dev.artifactory.datical.net/datical/datical-enterprisedb-edbas96:latest
+    image: docker.liquibase.net/datical-enterprisedb-edbas96:latest
     ports:
       - "5502:5444"
     restart: always
     # no environment or volumes as those were created at image creation
 
   edb-postgres-10:
-    image: docker-dev.artifactory.datical.net/datical/datical-enterprisedb-edbas10:latest
+    image: docker.liquibase.net/datical-enterprisedb-edbas10:latest
     ports:
       - "5503:5444"
     restart: always
     # no environment or volumes as those were created at image creation
 
   edb-postgres-11:
-    image: docker-dev.artifactory.datical.net/datical/datical-enterprisedb-edbas11:latest
+    image: docker.liquibase.net/datical-enterprisedb-edbas11:latest
     ports:
       - "5504:5444"
     restart: always
     # no environment or volumes as those were created at image creation
 
   edb-postgres-12:
-    image: docker-dev.artifactory.datical.net/datical/datical-enterprisedb-edbas12:latest
+    image: docker.liquibase.net/datical-enterprisedb-edbas12:latest
     ports:
       - "5505:5444"
     restart: always
     # no environment or volumes as those were created at image creation
 
   edb-postgres-13:
-    image: docker-dev.artifactory.datical.net/datical/datical-enterprisedb-edbas13:latest
+    image: docker.liquibase.net/datical-enterprisedb-edbas13:latest
     ports:
       - "5506:5444"
     restart: always
     # no environment or volumes as those were created at image creation
 
   edb-postgres-14:
-    image: docker-dev.artifactory.datical.net/datical/datical-enterprisedb-edbas14:latest
+    image: docker.liquibase.net/datical-enterprisedb-edbas14:latest
     ports:
       - "5507:5444"
     restart: always
@@ -57,49 +57,49 @@ services:
     # Without it tests will run in parallel and interfere with each other
 
   edb-edb-9.5:
-    image: docker-dev.artifactory.datical.net/datical/datical-enterprisedb-ppas95:latest
+    image: docker.liquibase.net/datical-enterprisedb-ppas95:latest
     ports:
       - "5508:5444"
     restart: always
     # no environment or volumes as those were created at image creation
 
   edb-edb-9.6:
-    image: docker-dev.artifactory.datical.net/datical/datical-enterprisedb-edbas96:latest
+    image: docker.liquibase.net/datical-enterprisedb-edbas96:latest
     ports:
       - "5509:5444"
     restart: always
     # no environment or volumes as those were created at image creation
 
   edb-edb-10:
-    image: docker-dev.artifactory.datical.net/datical/datical-enterprisedb-edbas10:latest
+    image: docker.liquibase.net/datical-enterprisedb-edbas10:latest
     ports:
       - "5510:5444"
     restart: always
     # no environment or volumes as those were created at image creation
 
   edb-edb-11:
-    image: docker-dev.artifactory.datical.net/datical/datical-enterprisedb-edbas11:latest
+    image: docker.liquibase.net/datical-enterprisedb-edbas11:latest
     ports:
       - "5511:5444"
     restart: always
     # no environment or volumes as those were created at image creation
 
   edb-edb-12:
-    image: docker-dev.artifactory.datical.net/datical/datical-enterprisedb-edbas12:latest
+    image: docker.liquibase.net/datical-enterprisedb-edbas12:latest
     ports:
       - "5512:5444"
     restart: always
     # no environment or volumes as those were created at image creation
 
   edb-edb-13:
-    image: docker-dev.artifactory.datical.net/datical/datical-enterprisedb-edbas13:latest
+    image: docker.liquibase.net/datical-enterprisedb-edbas13:latest
     ports:
       - "5513:5444"
     restart: always
     # no environment or volumes as those were created at image creation
 
   edb-edb-14:
-    image: docker-dev.artifactory.datical.net/datical/datical-enterprisedb-edbas14:latest
+    image: docker.liquibase.net/datical-enterprisedb-edbas14:latest
     ports:
       - "5514:5444"
     restart: always

diff --git a/src/test/resources/docker/oracle-artifactory/docker-compose.yml b/src/test/resources/docker/oracle-artifactory/docker-compose.yml
@@ -3,7 +3,7 @@ version: '3.3'
 services:
 
   oracle-ee-19.3.0:
-    image: docker-dev.artifactory.datical.net/datical/oracle-ee:19.3.0-local
+    image: docker.liquibase.net/oracle-ee:19.3.0-local
     ports:
         - "1521:1521"
     restart: always