fix build in github

Signed-off-by: Oliver Trosien <oliver.trosien@zalando.de>

Author: otrosien

.github/workflows/ci.yaml

@@ -18,7 +18,7 @@ jobs:
         make lint
         make
         make build/linux/e2e
-        IMAGE=es-operator VERSION=local make build.docker.ghcr
+        IMAGE=es-operator VERSION=local make build.docker.local
     - run: goveralls -coverprofile=profile.cov -service=github
       env:
         COVERALLS_TOKEN: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/docker-multiarch.yaml

@@ -56,12 +56,13 @@ jobs:
           images: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}
           tags: |
             type=ref,event=branch
-            type=ref,event=pr
+            type=ref,event=pr,prefix=pr-
             type=semver,pattern={{version}}
             type=semver,pattern={{major}}.{{minor}}
             type=semver,pattern={{major}}
             type=raw,value=latest,enable={{is_default_branch}}
-            type=sha,prefix={{branch}}-
+            type=sha,prefix={{branch}}-,enable={{is_default_branch}}
+            type=sha,prefix=pr-,enable=${{ github.event_name == 'pull_request' }}
 
       - name: Build multiarch binaries
         run: |

Dockerfile.ghcr

@@ -7,11 +7,12 @@ COPY --chmod=0644 docker-context/dnf.conf /sysroot/etc/dnf/dnf.conf
 RUN dnf --refresh --releasever=latest --installroot /sysroot -y \
     --setopt=install_weak_deps=False --setopt=fastestmirror=True \
     --setopt=max_parallel_downloads=10 --setopt=deltarpm=True \
+    --setopt=tsflags=noscripts \
     --nodocs install bash coreutils-single curl-minimal microdnf microdnf-dnf glibc-minimal-langpack gnupg2-minimal && \
     echo 'latest' > /sysroot/etc/dnf/vars/releasever && \
     dnf clean all --installroot /sysroot
 
-FROM container-registry.zalando.net/library/scratch:latest
+FROM scratch
 
 LABEL maintainer="Team Pandora @ Zalando SE <team-pandora@zalando.de>"
 
@@ -23,4 +24,4 @@ WORKDIR /
 ARG TARGETARCH
 COPY build/linux/${TARGETARCH}/es-operator /es-operator
 
-ENTRYPOINT ["/es-operator"]
+ENTRYPOINT ["/es-operator"]

Makefile

@@ -83,5 +83,9 @@ build.multiarch: $(GENERATED) $(SOURCES)
 build.docker.ghcr: build.multiarch
 	docker buildx build --platform linux/amd64,linux/arm64 -t "$(IMAGE):$(TAG)" -f Dockerfile.ghcr .
 
+# Local build target for e2e testing (single arch with --load)
+build.docker.local: build.multiarch
+	docker buildx build --platform linux/amd64 -t "$(IMAGE):$(TAG)" -f Dockerfile.ghcr --load .
+
 build.push.ghcr: build.multiarch
 	docker buildx build --platform linux/amd64,linux/arm64 -t "$(IMAGE):$(TAG)" -f Dockerfile.ghcr --push .