Fix/compose

.circleci/config.yml

@@ -1,7 +1,7 @@
 version: 2.1
 
 orbs:
-  shellcheck: circleci/shellcheck@1.3.16
+  shellcheck: circleci/shellcheck@3.2.0
 
 executors:
   docker-executor:
@@ -10,156 +10,237 @@ executors:
     resource_class: medium
 
 commands:
-  build-multiarch:
-    parameters:
-      image:
-        type: string
-      workdir:
-        type: string
+  setup-buildx:
+    steps:
+      - run:
+          name: Install Docker Buildx
+          command: |
+            mkdir -p ~/.docker/cli-plugins
+            BUILDX_VERSION=v0.12.1
+            wget -q "https://github.com/docker/buildx/releases/download/${BUILDX_VERSION}/buildx-${BUILDX_VERSION}.linux-amd64" \
+              -O ~/.docker/cli-plugins/docker-buildx
+            chmod +x ~/.docker/cli-plugins/docker-buildx
+            docker buildx version
+
+      - run:
+          name: Create buildx builder
+          command: |
+            docker buildx create --name multiarch --driver docker-container --use --bootstrap
+            docker buildx inspect multiarch
+
+  set-build-tag:
+    description: "Set BUILD_TAG environment variable based on branch or tag"
+    steps:
+      - run:
+          name: Set build tag
+          command: |
+            if [ -n "${CIRCLE_TAG}" ]; then
+              TAG="${CIRCLE_TAG}"
+            else
+              TAG="${CIRCLE_BRANCH}-${CIRCLE_SHA1:0:7}"
+            fi
+            # lowercase
+            TAG=$(echo "$TAG" | tr '[:upper:]' '[:lower:]')
+            # replace invalid chars with '-'
+            echo "export BUILD_TAG=$(echo "$TAG" | sed 's/[^a-z0-9._-]/-/g')" >> $BASH_ENV
+            source $BASH_ENV
+            echo "Build tag: ${BUILD_TAG}"
+
+jobs:
+  shellcheck:
+    docker:
+      - image: koalaman/shellcheck-alpine:stable
+    steps:
+      - checkout
+      - run:
+          name: Run shellcheck
+          command: |
+            find . -type f -name "*.sh" -exec shellcheck --exclude=SC2154,SC1091,SC2034,SC2096,SC2038 {} +
+
+  build-x86_64:
+    executor: docker-executor
     steps:
       - checkout
       - setup_remote_docker:
-          version: 20.10.18
+          version: docker24
           docker_layer_caching: true
 
-      - run:
-          name: Enable QEMU for multi-arch
-          command: |
-            docker run --rm --privileged multiarch/qemu-user-static --reset -p yes
+      - setup-buildx
+      - set-build-tag
 
       - run:
           name: Login to Docker Hub
           command: |
             echo "$DOCKER_PASS" | docker login -u "$DOCKER_USER" --password-stdin
 
       - run:
-          name: Build amd64
+          name: Build and push x86_64
           command: |
-            cd << parameters.workdir >>
-            docker build \
-              --platform linux/amd64 \
-              -t "$DOCKER_USER/<< parameters.image >>:${CIRCLE_TAG}-x86_64" \
-              -f Dockerfile.x86_64 .
-            docker push "$DOCKER_USER/<< parameters.image >>:${CIRCLE_TAG}-x86_64"
+            export DOCKER_ORG=${DOCKER_USER}
+            export BAKE_TAG=${BUILD_TAG}
+            export BALENA_ARCH=x86_64
+            export PLATFORM=linux/amd64
+
+            echo "Building ${DOCKER_ORG}/*:${BAKE_TAG} for ${PLATFORM}"
+            cp -vf "docker-compose.${BALENA_ARCH}" docker-compose.yml
+            docker buildx bake -f docker-bake.hcl \
+              --set "*.platform=${PLATFORM}" \
+              --push
 
       - run:
-          name: Build arm64
+          name: Tag images with architecture suffix
           command: |
-            cd << parameters.workdir >>
-            docker build \
-              --platform linux/arm64 \
-              -t "$DOCKER_USER/<< parameters.image >>:${CIRCLE_TAG}-aarch64" \
-              -f Dockerfile.aarch64 .
-            docker push "$DOCKER_USER/<< parameters.image >>:${CIRCLE_TAG}-aarch64"
+            for service in mysqldb php-fpm httpd balena-storage; do
+              docker buildx imagetools create \
+                --tag ${DOCKER_USER}/${service}:${BUILD_TAG}-x86_64 \
+                ${DOCKER_USER}/${service}:${BUILD_TAG}
+            done
+
+  build-aarch64:
+    executor: docker-executor
+    steps:
+      - checkout
+      - setup_remote_docker:
+          version: docker24
+          docker_layer_caching: true
+
+      - setup-buildx
+      - set-build-tag
 
       - run:
-          name: Build armhf
+          name: Login to Docker Hub
           command: |
-            cd << parameters.workdir >>
-            docker build \
-              --platform linux/arm/v7 \
-              -t "$DOCKER_USER/<< parameters.image >>:${CIRCLE_TAG}-armhf" \
-              -f Dockerfile.armhf .
-            docker push "$DOCKER_USER/<< parameters.image >>:${CIRCLE_TAG}-armhf"
+            echo "$DOCKER_PASS" | docker login -u "$DOCKER_USER" --password-stdin
 
       - run:
-          name: Create multi-arch manifest
+          name: Build and push aarch64
           command: |
-            docker manifest create "$DOCKER_USER/<< parameters.image >>:${CIRCLE_TAG}" \
-              "$DOCKER_USER/<< parameters.image >>:${CIRCLE_TAG}-x86_64" \
-              "$DOCKER_USER/<< parameters.image >>:${CIRCLE_TAG}-aarch64" \
-              "$DOCKER_USER/<< parameters.image >>:${CIRCLE_TAG}-armhf"
-
-            docker manifest push "$DOCKER_USER/<< parameters.image >>:${CIRCLE_TAG}"
+            export DOCKER_ORG=${DOCKER_USER}
+            export BAKE_TAG=${BUILD_TAG}
+            export BALENA_ARCH=aarch64
+            export PLATFORM=linux/arm64
+
+            echo "Building ${DOCKER_ORG}/*:${BAKE_TAG} for ${PLATFORM}"
+            cp -vf "docker-compose.${BALENA_ARCH}" docker-compose.yml
+            docker buildx bake -f docker-bake.hcl \
+              --set "*.platform=${PLATFORM}" \
+              --push
 
+      - run:
+          name: Tag images with architecture suffix
+          command: |
+            for service in mysqldb php-fpm httpd balena-storage; do
+              docker buildx imagetools create \
+                --tag ${DOCKER_USER}/${service}:${BUILD_TAG}-aarch64 \
+                ${DOCKER_USER}/${service}:${BUILD_TAG}
+            done
 
-jobs:
-  httpd:
+  build-armhf:
     executor: docker-executor
     steps:
-      - build-multiarch:
-          image: httpd
-          workdir: deployment/images/httpd
+      - checkout
+      - setup_remote_docker:
+          version: docker24
+          docker_layer_caching: true
 
-  mysql:
-    executor: docker-executor
-    steps:
-      - build-multiarch:
-          image: mysql
-          workdir: deployment/images/mysql
+      - setup-buildx
+      - set-build-tag
 
-  php-fpm:
-    executor: docker-executor
-    steps:
-      - build-multiarch:
-          image: php-fpm
-          workdir: deployment/images/php-fpm
+      - run:
+          name: Login to Docker Hub
+          command: |
+            echo "$DOCKER_PASS" | docker login -u "$DOCKER_USER" --password-stdin
+
+      - run:
+          name: Build and push armhf
+          command: |
+            export DOCKER_ORG=${DOCKER_USER}
+            export BAKE_TAG=${BUILD_TAG}
+            export BALENA_ARCH=armhf
+            export PLATFORM=linux/arm/v7
+
+            echo "Building ${DOCKER_ORG}/*:${BAKE_TAG} for ${PLATFORM}"
+            cp -vf "docker-compose.${BALENA_ARCH}" docker-compose.yml
+            docker buildx bake -f docker-bake.hcl \
+              --set "*.platform=${PLATFORM}" \
+              --push
+
+      - run:
+          name: Tag images with architecture suffix
+          command: |
+            for service in mysqldb php-fpm httpd balena-storage; do
+              docker buildx imagetools create \
+                --tag ${DOCKER_USER}/${service}:${BUILD_TAG}-armhf \
+                ${DOCKER_USER}/${service}:${BUILD_TAG}
+            done
 
-  build-and-compose:
+  create-manifests:
     executor: docker-executor
     steps:
       - checkout
       - setup_remote_docker:
-          version: 20.10.18
-          docker_layer_caching: true
+          version: docker24
+
+      - set-build-tag
+
       - run:
           name: Login to Docker Hub
           command: |
             echo "$DOCKER_PASS" | docker login -u "$DOCKER_USER" --password-stdin
+
       - run:
-          name: Deploy with docker compose
+          name: Create and push multi-arch manifests
           command: |
-            cd deployment
-            docker compose pull
-            docker compose up -d
+            for service in mysqldb php-fpm httpd balena-storage; do
+              echo "Creating manifest for ${service}:${BUILD_TAG}"
+
+              # Create multi-arch manifest
+              docker manifest create ${DOCKER_USER}/${service}:${BUILD_TAG} \
+                ${DOCKER_USER}/${service}:${BUILD_TAG}-x86_64 \
+                ${DOCKER_USER}/${service}:${BUILD_TAG}-aarch64 \
+                ${DOCKER_USER}/${service}:${BUILD_TAG}-armhf
+
+              docker manifest push ${DOCKER_USER}/${service}:${BUILD_TAG}
+
+              # Also create/update latest tag for main branch
+              if [ "${CIRCLE_BRANCH}" = "main" ] || [ "${CIRCLE_BRANCH}" = "master" ]; then
+                echo "Updating latest tag for ${service}"
+                docker manifest create ${DOCKER_USER}/${service}:latest \
+                  ${DOCKER_USER}/${service}:${BUILD_TAG}-x86_64 \
+                  ${DOCKER_USER}/${service}:${BUILD_TAG}-aarch64 \
+                  ${DOCKER_USER}/${service}:${BUILD_TAG}-armhf
+
+                docker manifest push ${DOCKER_USER}/${service}:latest
+              fi
+            done
 
+      - run:
+          name: Verify manifests
+          command: |
+            for service in mysqldb php-fpm httpd balena-storage; do
+              echo "Verifying ${service}:${BUILD_TAG}"
+              docker manifest inspect ${DOCKER_USER}/${service}:${BUILD_TAG}
+            done
 
 workflows:
-  version: 2
-  build:
+  build-all-branches:
     jobs:
-      - shellcheck/check:
-          ignore: 'SC2154,SC1091,SC2034,SC2096,SC2038'
-          filters:
-            tags:
-              only: /^v.*/
-            branches:
-              ignore: /.*/
-
-      - httpd:
+      - shellcheck
+
+      - build-x86_64:
           requires:
-            - shellcheck/check
-          filters:
-            tags:
-              only: /^v.*/
-            branches:
-              ignore: /.*/
-
-      - mysql:
+            - shellcheck
+
+      - build-aarch64:
           requires:
-            - shellcheck/check
-          filters:
-            tags:
-              only: /^v.*/
-            branches:
-              ignore: /.*/
-
-      - php-fpm:
+            - shellcheck
+
+      - build-armhf:
           requires:
-            - shellcheck/check
-          filters:
-            tags:
-              only: /^v.*/
-            branches:
-              ignore: /.*/
-
-      - build-and-compose:
+            - shellcheck
+
+      - create-manifests:
           requires:
-            - httpd
-            - mysql
-            - php-fpm
-          filters:
-            tags:
-              only: /^v.*/
-            branches:
-              ignore: /.*/
+            - build-x86_64
+            - build-aarch64
+            - build-armhf

.env

@@ -1 +1 @@
-/home/brunotr/acake2php/armhf.env
+/var/www/html/armhf.env