Browse Source

fix: ubi build with very VERY old docker buildx version (#5846)

Gergely Bräutigam 2 months ago
parent
commit
2d3c7996bd

+ 0 - 1
.github/workflows/publish.yml

@@ -70,7 +70,6 @@ jobs:
       - name: Setup Docker Buildx
       - name: Setup Docker Buildx
         uses: docker/setup-buildx-action@8d2750c68a42422c14e847fe6c8ac0403b4cbd6f # v3.12.0
         uses: docker/setup-buildx-action@8d2750c68a42422c14e847fe6c8ac0403b4cbd6f # v3.12.0
         with:
         with:
-          version: 'v0.4.2'
           install: true
           install: true
 
 
       - name: Setup Go
       - name: Setup Go

+ 0 - 1
Dockerfile.ubi

@@ -19,7 +19,6 @@ RUN mkdir /image && \
 COPY ubi-build-files-${TARGETARCH}.txt /tmp
 COPY ubi-build-files-${TARGETARCH}.txt /tmp
 # Copy all the required files from the base UBI image into the image directory
 # Copy all the required files from the base UBI image into the image directory
 # As the go binary is not statically compiled this includes everything needed for CGO to work, cacerts, tzdata and RH release files
 # As the go binary is not statically compiled this includes everything needed for CGO to work, cacerts, tzdata and RH release files
-RUN ls -lR /
 RUN tar cf /tmp/files.tar -T /tmp/ubi-build-files-${TARGETARCH}.txt && tar xf /tmp/files.tar -C /image/ \
 RUN tar cf /tmp/files.tar -T /tmp/ubi-build-files-${TARGETARCH}.txt && tar xf /tmp/files.tar -C /image/ \
   && rpm --root /image --initdb \
   && rpm --root /image --initdb \
   && PACKAGES=$(rpm -qf $(cat /tmp/ubi-build-files-${TARGETARCH}.txt) | grep -v "is not owned by any package" | sort -u) \
   && PACKAGES=$(rpm -qf $(cat /tmp/ubi-build-files-${TARGETARCH}.txt) | grep -v "is not owned by any package" | sort -u) \

+ 1 - 1
e2e/suites/provider/cases/secretserver/secretserver.go

@@ -30,7 +30,7 @@ import (
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 )
 )
 
 
-var _ = Describe("[secretserver]", Label("secretserver"), func() {
+var _ = PDescribe("[secretserver]", Label("secretserver"), func() {
 
 
 	f := framework.New("eso-secretserver")
 	f := framework.New("eso-secretserver")