consolidate into .gitlab-ci.yml

.gitlab-ci.yml

@@ -13,7 +13,13 @@ docker-build:
         tag=":$CI_COMMIT_REF_SLUG"
         echo "Running on branch '$CI_COMMIT_BRANCH': tag = $tag"
       fi
-    - ./buildx.sh
+    #- docker buildx use $(docker buildx create --platform linux/arm64,linux/amd64,linux/riscv64,linux/arm/v7)
+    - docker buildx build --platform=linux/arm64,linux/amd64 -t "${CI_REGISTRY_IMAGE}:bookworm" --build-arg="FRM=debian:bookworm-slim" --push .
+    - docker buildx build --platform=linux/arm64,linux/amd64 -t "${CI_REGISTRY_IMAGE}:latest" --build-arg="FRM=debian:bookworm-slim" --push .
+    #docker buildx build --platform linux/arm64,linux/amd64,linux/arm/v7,linux/riscv64 -t beagle/ubuntu-build:jammy --build-arg="FRM=ubuntu:jammy" --push .
+    #docker buildx build --platform linux/arm64,linux/amd64,linux/arm/v7,linux/riscv64 -t beagle/ubuntu-build:lunar --build-arg="FRM=ubuntu:lunar" --push .
+    #docker buildx build --platform linux/arm64,linux/amd64,linux/arm/v7,linux/riscv64 -t beagle/ubuntu-build:mantic --build-arg="FRM=ubuntu:mantic" --push .
+    #docker buildx build --platform linux/arm64 -t ${CI_REGISTRY}/jkridner/ubuntu-build:latest --build-arg="FRM=ubuntu:latest" --push .
   rules:
     - if: $CI_COMMIT_BRANCH
       exists:

buildx.sh

-#!/bin/bash -xe
-# docker buildx use $(docker buildx create --platform linux/arm64,linux/amd64,linux/riscv64,linux/arm/v7)
-docker buildx build --platform linux/arm64,linux/amd64 -t ${CI_REGISTRY}/jkridner/debian-build:bullseye --build-arg="FRM=debian:bullseye-slim" --push .
-docker buildx build --platform linux/arm64,linux/amd64 -t ${CI_REGISTRY}/jkridner/debian-build:bookworm --build-arg="FRM=debian:bookworm-slim" --push .
-docker buildx build --platform linux/arm64,linux/amd64 -t ${CI_REGISTRY}/jkridner/debian-build:latest --build-arg="FRM=debian:bookworm-slim" --push .
-#docker buildx build --platform linux/arm64,linux/amd64,linux/arm/v7,linux/riscv64 -t beagle/ubuntu-build:jammy --build-arg="FRM=ubuntu:jammy" --push .
-#docker buildx build --platform linux/arm64,linux/amd64,linux/arm/v7,linux/riscv64 -t beagle/ubuntu-build:lunar --build-arg="FRM=ubuntu:lunar" --push .
-#docker buildx build --platform linux/arm64,linux/amd64,linux/arm/v7,linux/riscv64 -t beagle/ubuntu-build:mantic --build-arg="FRM=ubuntu:mantic" --push .
-#docker buildx build --platform linux/arm64 -t ${CI_REGISTRY}/jkridner/ubuntu-build:latest --build-arg="FRM=ubuntu:latest" --push .