Update CI image

apache · Oct 21, 2024 · 59b1b58 · 59b1b58
1 parent f0174e2
commit 59b1b58
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 14 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -2,7 +2,7 @@ version: 2
 jobs:
   check:
     docker:
-      - image: registry.gitlab.com/poundex/geb-ci-docker-image:20241010161232
+      - image: gebish/ci:v13
     resource_class: large
     environment:
       GRADLE_OPTS: -Xmx1024m -XX:MaxMetaspaceSize=256m
@@ -45,7 +45,7 @@ jobs:
             docker network create dind
             docker run -d --network dind -e DOCKER_TLS_CERTDIR="" --privileged --name dind  docker:dind
             sleep 20
-            docker run --network dind -v ${WORKING_DIRECTORY}:/home/circleci/workspace -w /home/circleci/workspace -e DOCKER_HOST="tcp://dind:2375" -e OCI_WRITER_KEY_PASSPHRASE=$OCI_WRITER_KEY_PASSPHRASE registry.gitlab.com/poundex/geb-ci-docker-image:20241010161232 /bin/bash -c "Xvfb :99 -screen 1 1280x1024x16 -nolisten tcp > /dev/null 2>&1 & export DISPLAY=:99 ; GRADLE_OPTS=\"-Xmx1024m -XX:MaxMetaspaceSize=256m\" GRADLE_USER_HOME=\".gradle-home\" ./gradlew --no-daemon --max-workers 4 --parallel -Pci :doc:manual-snippets:check :doc:manual-snippets:fixtures:check :doc:manual-snippets:real-browser:check :doc:manual:build :doc:asciidoctor-extension:check"
+            docker run --network dind -v ${WORKING_DIRECTORY}:/home/circleci/workspace -w /home/circleci/workspace -e DOCKER_HOST="tcp://dind:2375" -e OCI_WRITER_KEY_PASSPHRASE=$OCI_WRITER_KEY_PASSPHRASE gebish/ci:v13 /bin/bash -c "Xvfb :99 -screen 1 1280x1024x16 -nolisten tcp > /dev/null 2>&1 & export DISPLAY=:99 ; GRADLE_OPTS=\"-Xmx1024m -XX:MaxMetaspaceSize=256m\" GRADLE_USER_HOME=\".gradle-home\" ./gradlew --no-daemon --max-workers 4 --parallel -Pci :doc:manual-snippets:check :doc:manual-snippets:fixtures:check :doc:manual-snippets:real-browser:check :doc:manual:build :doc:asciidoctor-extension:check"
       - run: &collectTestResults
           name: Copy all test results to a directory
           when: always
@@ -77,7 +77,7 @@ jobs:
             docker network create dind
             docker run -d --network dind -e DOCKER_TLS_CERTDIR="" --privileged --name dind  docker:dind
             sleep 20
-            docker run --network dind -v ${WORKING_DIRECTORY}:/home/circleci/workspace -w /home/circleci/workspace -e DOCKER_HOST="tcp://dind:2375" -e OCI_WRITER_KEY_PASSPHRASE=$OCI_WRITER_KEY_PASSPHRASE registry.gitlab.com/poundex/geb-ci-docker-image:20241010161232 /bin/bash -c "GRADLE_OPTS=\"-Xmx1024m -XX:MaxMetaspaceSize=256m\" GRADLE_USER_HOME=\".gradle-home\" ./gradlew --no-daemon --max-workers 4 --parallel -Pci allDockerisedCrossBrowserTests"
+            docker run --network dind -v ${WORKING_DIRECTORY}:/home/circleci/workspace -w /home/circleci/workspace -e DOCKER_HOST="tcp://dind:2375" -e OCI_WRITER_KEY_PASSPHRASE=$OCI_WRITER_KEY_PASSPHRASE gebish/ci:v13 /bin/bash -c "GRADLE_OPTS=\"-Xmx1024m -XX:MaxMetaspaceSize=256m\" GRADLE_USER_HOME=\".gradle-home\" ./gradlew --no-daemon --max-workers 4 --parallel -Pci allDockerisedCrossBrowserTests"
       - run: *collectTestResults
       - store_test_results:
           path: ~/test-results/
@@ -89,7 +89,7 @@ jobs:
             - .gradle-home
   local-cross-browser:
     docker:
-      - image: registry.gitlab.com/poundex/geb-ci-docker-image:20241010161232
+      - image: gebish/ci:v13
     resource_class: large
     environment:
         GRADLE_OPTS: -Xmx1024m -XX:MaxMetaspaceSize=256m
@@ -113,7 +113,7 @@ jobs:
             - .gradle-home
   saucelabs:
     docker:
-      - image: registry.gitlab.com/poundex/geb-ci-docker-image:20241010161232
+      - image: gebish/ci:v13
     resource_class: large
     environment:
         GRADLE_OPTS: -Xmx1024m -XX:MaxMetaspaceSize=256m
@@ -140,7 +140,7 @@ jobs:
 #  TODO: Return LambdaTest integration to the CI pipeline. Jobs are failing in CI when calling to LambdaTest, but not locally.
 #  lambdatest:
 #    docker:
-#      - image: gebish/ci:v7
+#      - image: gebish/ci:v13
 #    resource_class: large
 #    environment:
 #      GRADLE_OPTS: -Xmx1024m -XX:MaxMetaspaceSize=256m
@@ -170,7 +170,7 @@ jobs:
 #            - .gradle-home
   non-ie:
     docker:
-      - image: registry.gitlab.com/poundex/geb-ci-docker-image:20241010161232
+      - image: gebish/ci:v13
     resource_class: large
     environment:
         GRADLE_OPTS: -Xmx1024m -XX:MaxMetaspaceSize=256m
@@ -196,7 +196,7 @@ jobs:
             - .gradle-home
   ie:
     docker:
-      - image: registry.gitlab.com/poundex/geb-ci-docker-image:20241010161232
+      - image: gebish/ci:v13
     resource_class: large
     environment:
         GRADLE_OPTS: -Xmx1024m -XX:MaxMetaspaceSize=256m
@@ -222,7 +222,7 @@ jobs:
             - .gradle-home
   upload:
     docker:
-      - image: registry.gitlab.com/poundex/geb-ci-docker-image:20241010161232
+      - image: gebish/ci:v13
     resource_class: large
     environment:
         GRADLE_OPTS: -Xmx1024m -XX:MaxMetaspaceSize=256m
@@ -243,7 +243,7 @@ jobs:
             - .gradle-home
   publish-site:
     docker:
-      - image: registry.gitlab.com/poundex/geb-ci-docker-image:20241010161232
+      - image: gebish/ci:v13
     steps:
       - checkout
       - run:
@@ -252,7 +252,7 @@ jobs:
             git push -f heroku master
   trigger-example-projects-4.x:
     docker:
-      - image: registry.gitlab.com/poundex/geb-ci-docker-image:20241010161232
+      - image: gebish/ci:v13
     steps:
       - run:
           command: |
@@ -262,7 +262,7 @@ jobs:
             curl -H "Authorization: Bearer ${APPVEYOR_TOKEN}" -H "Content-type: application/json" -X POST https://ci.appveyor.com/api/builds -d '{"accountName": "erdi", "projectSlug": "geb-example-gradle", "branch": "4.x"}'
   trigger-example-projects-master:
     docker:
-      - image: registry.gitlab.com/poundex/geb-ci-docker-image:20241010161232
+      - image: gebish/ci:v13
     steps:
       - run:
           command: |

diff --git a/build-in-docker.sh b/build-in-docker.sh
@@ -2,8 +2,8 @@
 
 export WORKING_DIRECTORY=`pwd`
 export HOME_DIRECTORY=`echo ~`
-export IMAGE_REPOSITORY="registry.gitlab.com/poundex/geb-ci-docker-image"
-export IMAGE_TAG="20241010161232"
+export IMAGE_REPOSITORY="gebish/ci"
+export IMAGE_TAG="v13"
 
 while getopts v: flag
 do