ci: fix building included images.

.github/workflows/base-image.yml

@@ -35,11 +35,31 @@ jobs:
           username: ${{ github.actor }}
           password: ${{ secrets.GITHUB_TOKEN }}
       - name: Build and push tagged image
-        uses: docker/bake-action@v4
+        uses: docker/bake-action@v5
         with:
           workdir: ${{ matrix.image.dir }}
           files: docker-compose.yml
+          load: true
           set: |
             *.cache-from=type=gha,scope=${{ matrix.image.name }}
             *.cache-to=type=gha,mode=max,scope=${{ matrix.image.name }}
           push: ${{ github.event_name == 'push' && vars.PUSH_TO_REGISTRY == 'true' && github.ref_type == 'tag' }}
+      - name: Point IOC Dockerfile to image that was just built
+        run: sed -i "s/v.*-dev/$TAG/" Dockerfile
+      - name: Configure builder using docker driver
+        uses: docker/setup-buildx-action@v3
+        id: dockerbuilder
+        with:
+          driver: docker
+      - name: Build and push included IOC images
+        if: ${{ matrix.image.name == 'lnls-debian-11-epics-7' }}
+        uses: docker/bake-action@v5
+        with:
+          workdir: images/
+          builder: ${{ steps.dockerbuilder.outputs.name }}
+          allow: fs.read=../Dockerfile
+          files: |
+            docker-compose-opcua.yml
+            docker-compose-motorpigcs2.yml
+            docker-compose-mca.yml
+          push: ${{ github.event_name == 'push' && vars.PUSH_TO_REGISTRY == 'true' && github.ref_type == 'tag' }}

.github/workflows/ioc-images.yml

@@ -25,7 +25,7 @@ jobs:
           username: ${{ github.actor }}
           password: ${{ secrets.GITHUB_TOKEN }}
       - name: Build and push tagged image
-        uses: docker/bake-action@v4
+        uses: docker/bake-action@v5
         with:
           workdir: ./
           files: docker-compose.yml

base/docker-compose.yml

@@ -9,5 +9,5 @@ services:
         org.opencontainers.image.source: ${SOURCE:-https://github.com/cnpem/epics-in-docker}
         org.opencontainers.image.description: "EPICS base and modules build image"
       args:
-        JOBS: ${JOBS:-1}
+        JOBS: ${JOBS:--1}
         DEBIAN_VERSION: 11.9

base/install-functions.sh

@@ -1,3 +1,8 @@
+if [ "$JOBS" -eq "-1" ]; then
+    JOBS=$(nproc)
+    echo "Setting JOBS to $JOBS" >&2
+fi
+
 get_module_path() {
     for module in $@; do
         if [ -n "$module" ]; then

base/musl/docker-compose.yml

@@ -9,5 +9,5 @@ services:
         org.opencontainers.image.source: ${SOURCE:-https://github.com/cnpem/epics-in-docker}
         org.opencontainers.image.description: "EPICS base and modules build image for fully static executables"
       args:
-        JOBS: ${JOBS:-1}
+        JOBS: ${JOBS:--1}
         ALPINE_VERSION: 3.20.3

images/docker-compose-mca.yml

@@ -1,5 +1,5 @@
 services:
-  ioc:
+  mca:
     image: ghcr.io/cnpem/mca-epics-ioc:$TAG
     build:
       context: ./

images/docker-compose-motorpigcs2.yml

@@ -1,5 +1,5 @@
 services:
-  ioc:
+  motor-pigcs2:
     image: ghcr.io/cnpem/motor-pigcs2-epics-ioc:$TAG
     build:
       context: ./

images/docker-compose-opcua.yml

@@ -1,5 +1,5 @@
 services:
-  ioc:
+  opcua:
     image: ghcr.io/cnpem/opcua-epics-ioc:$TAG
     build:
       context: ./