Change job execution

barthel · Jun 7, 2024 · df6bb20 · df6bb20
1 parent 7d708cf
commit df6bb20
Showing 1 changed file with 8 additions and 14 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -36,7 +36,7 @@ workflows:
             branches:
               only: main
 commands:
-  setup:
+  setup-multi-arch-docker:
     steps:
       - run:
           name: Prepare for multi arch build (setup qemu)
@@ -59,10 +59,10 @@ commands:
 jobs:
   build:
     machine:
-      image: ubuntu-2204:2023.02.1
+      image: ubuntu-2204:current
     resource_class: large
     steps:
-      - setup
+      - setup-multi-arch-docker
       - checkout
       - run:
           name: Build docker image
@@ -90,25 +90,19 @@ jobs:
       platform:
         type: enum
         enum: ["linux/amd64", "linux/arm64"]
-    machine:
-      image: ubuntu-2204:2023.02.1
+    docker:
+      - image: ${DOCKER_USER}/asciidoctor:${CIRCLE_TAG:-latest}
     resource_class: medium
     steps:
       - run:
           name: Test docker image (<< parameters.platform >>)
           no_output_timeout: 1h
           command: |
-            echo "${DOCKER_PASS}" | docker login -u "${DOCKER_USER}" --password-stdin
-            docker pull ${DOCKER_USER}/asciidoctor:${CIRCLE_TAG:-latest}
-            docker run --rm \
-              -v $(pwd)/src/doc:/documents/ \
-              -v $(pwd)/.examples/dist:/dist \
-              --platform << parameters.platform >> \
-              ${DOCKER_USER}/asciidoctor:${CIRCLE_TAG:-latest} \
-                inliner --help
+            mkdir -p /documents/doc
+            inliner --help
   example-build:
     machine:
-      image: ubuntu-2204:2023.02.1
+      image: ubuntu-2204:current
     resource_class: large
     steps:
       - checkout