diff --git a/.github/workflows/build-multiarch-backend.yml b/.github/workflows/build-multiarch-backend.yml index 69aa8b7..e5c953a 100644 --- a/.github/workflows/build-multiarch-backend.yml +++ b/.github/workflows/build-multiarch-backend.yml @@ -20,8 +20,4 @@ jobs: - name: Build and Push Multi-Arch Image run: | - cd backend && \ - docker buildx build \ - --platform linux/amd64,linux/arm64,linux/s390x \ - -t quay.io/skupper/hello-world-backend \ - --push -f Containerfile . + ./plano --file backend/.plano.py build,push \ No newline at end of file diff --git a/.github/workflows/build-multiarch-frontend.yml b/.github/workflows/build-multiarch-frontend.yml index 9f60094..95cecb6 100644 --- a/.github/workflows/build-multiarch-frontend.yml +++ b/.github/workflows/build-multiarch-frontend.yml @@ -20,8 +20,4 @@ jobs: - name: Build and Push Multi-Arch Image run: | - cd frontend && \ - docker buildx build \ - --platform linux/amd64,linux/arm64,linux/s390x \ - -t quay.io/skupper/hello-world-frontend \ - --push -f Containerfile . + ./plano --file frontend/.plano.py update-gesso,build,push diff --git a/.github/workflows/main.yaml b/.github/workflows/main.yaml index ca8214b..9475127 100644 --- a/.github/workflows/main.yaml +++ b/.github/workflows/main.yaml @@ -28,7 +28,7 @@ jobs: strategy: fail-fast: false matrix: - skupper-version: [latest, main] + skupper-version: [v1-dev-release, main] runs-on: ubuntu-latest steps: - uses: actions/checkout@v4 diff --git a/backend/.plano.py b/backend/.plano.py index 00fa498..9a3b826 100644 --- a/backend/.plano.py +++ b/backend/.plano.py @@ -29,7 +29,7 @@ def build(no_cache=False): # podman build with --manifest creates or adds to an existing manifest. We want brand new run(f"podman manifest rm {image_tag}", check=False) run(f"podman rmi {image_tag}", check=False) - run(f"podman build {no_cache_arg} --format docker --platform linux/amd64,linux/arm64,linux/s390x --manifest {image_tag} .") + run(f"podman build {no_cache_arg} --format docker --platform linux/amd64,linux/arm64,linux/s390x,linux/ppc64le --file backend/Containerfile --manifest {image_tag} ./backend") @command diff --git a/backend/Containerfile b/backend/Containerfile index 31260af..1753c88 100644 --- a/backend/Containerfile +++ b/backend/Containerfile @@ -28,7 +28,7 @@ FROM --platform=$TARGETPLATFORM mirror.gcr.io/library/python:alpine AS run RUN adduser -S fritz -G root USER fritz -COPY --from=build /usr/local/lib/python3.13/site-packages /usr/local/lib/python3.13/site-packages +COPY --from=build /usr/local/lib/python3.14/site-packages /usr/local/lib/python3.14/site-packages COPY --chown=fritz:root python /home/fritz/python EXPOSE 8080 diff --git a/frontend/.plano.py b/frontend/.plano.py index 9d73670..72414b3 100644 --- a/frontend/.plano.py +++ b/frontend/.plano.py @@ -30,7 +30,7 @@ def build(no_cache=False): # podman build with --manifest creates or adds to an existing manifest. We want brand new run(f"podman manifest rm {image_tag}", check=False) run(f"podman rmi {image_tag}", check=False) - run(f"podman build {no_cache_arg} --format docker --platform linux/amd64,linux/arm64,linux/s390x --manifest {image_tag} .") + run(f"podman build {no_cache_arg} --format docker --platform linux/amd64,linux/arm64,linux/s390x,linux/ppc64le --file frontend/Containerfile --manifest {image_tag} ./frontend") @command diff --git a/frontend/Containerfile b/frontend/Containerfile index 1fe5623..73cc130 100644 --- a/frontend/Containerfile +++ b/frontend/Containerfile @@ -28,7 +28,7 @@ FROM --platform=$TARGETPLATFORM mirror.gcr.io/library/python:alpine AS run RUN adduser -S fritz -G root USER fritz -COPY --from=build /usr/local/lib/python3.13/site-packages /usr/local/lib/python3.13/site-packages +COPY --from=build /usr/local/lib/python3.14/site-packages /usr/local/lib/python3.14/site-packages COPY --chown=fritz:root python /home/fritz/python COPY --chown=fritz:root static /home/fritz/static