From 9ed94742a494abd720d82b32f1450401162bbdb4 Mon Sep 17 00:00:00 2001 From: JasonPowr Date: Thu, 28 Nov 2024 14:20:46 +0000 Subject: [PATCH] update base image and unit test image --- .tekton/fulcio-pull-request.yaml | 10 +++++++++- .tekton/fulcio-push.yaml | 10 +++++++++- Dockerfile.fulcio-server.rh | 4 ++-- 3 files changed, 20 insertions(+), 4 deletions(-) diff --git a/.tekton/fulcio-pull-request.yaml b/.tekton/fulcio-pull-request.yaml index 6d2b4d961..49d196cc2 100644 --- a/.tekton/fulcio-pull-request.yaml +++ b/.tekton/fulcio-pull-request.yaml @@ -33,7 +33,15 @@ spec: - name: build-source-image value: "true" - name: go_unit_test - value: false # Until we can get a go image >= 1.23.0 + value: true + - name: go_base_image + value: brew.registry.redhat.io/rh-osbs/openshift-golang-builder@sha256:356986205e66dcc03ef9a9fef5a7a13d6d59c29efacf1d971f9224c678932cf0 + taskRunSpecs: + - pipelineTaskName: run-unit-test + serviceAccountName: appstudio-pipeline + podTemplate: + imagePullSecrets: + - name: brew-registry-pull-secret pipelineRef: resolver: git params: diff --git a/.tekton/fulcio-push.yaml b/.tekton/fulcio-push.yaml index 00a7866f2..3d92f398f 100644 --- a/.tekton/fulcio-push.yaml +++ b/.tekton/fulcio-push.yaml @@ -31,7 +31,15 @@ spec: - name: build-source-image value: "true" - name: go_unit_test - value: false # Until we can get a go image >= 1.23.0 + value: true + - name: go_base_image + value: brew.registry.redhat.io/rh-osbs/openshift-golang-builder@sha256:356986205e66dcc03ef9a9fef5a7a13d6d59c29efacf1d971f9224c678932cf0 + taskRunSpecs: + - pipelineTaskName: run-unit-test + serviceAccountName: appstudio-pipeline + podTemplate: + imagePullSecrets: + - name: brew-registry-pull-secret pipelineRef: resolver: git params: diff --git a/Dockerfile.fulcio-server.rh b/Dockerfile.fulcio-server.rh index 3a1b329de..0ee23e3ba 100644 --- a/Dockerfile.fulcio-server.rh +++ b/Dockerfile.fulcio-server.rh @@ -13,7 +13,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -FROM brew.registry.redhat.io/rh-osbs/openshift-golang-builder:rhel_9_1.21@sha256:98a0ff138c536eee98704d6909699ad5d0725a20573e2c510a60ef462b45cce0 AS builder +FROM brew.registry.redhat.io/rh-osbs/openshift-golang-builder@sha256:356986205e66dcc03ef9a9fef5a7a13d6d59c29efacf1d971f9224c678932cf0 AS builder ENV APP_ROOT=/opt/app-root ENV GOPATH=$APP_ROOT @@ -26,7 +26,7 @@ RUN go mod download && \ go build -mod=readonly -o server main.go # Multi-Stage production build -FROM registry.access.redhat.com/ubi9/go-toolset@sha256:c7bfd2501cb1be171366434a368db669b32f08a0198c1473b9bff0a379613fc3 as deploy +FROM registry.access.redhat.com/ubi9-minimal@sha256:8b6978d555746877c73f52375f60fd7b6fd27d6aca000eaed27d0995303c13de as deploy LABEL description="Fulcio is a free-to-use certificate authority for issuing code signing certificates for an OpenID Connect (OIDC) identity, such as email address." LABEL io.k8s.description="Fulcio is a free-to-use certificate authority for issuing code signing certificates for an OpenID Connect (OIDC) identity, such as email address."