Skip to content

Commit

Permalink
update base images in dockerfile and go unit test
Browse files Browse the repository at this point in the history
  • Loading branch information
JasonPowr committed Nov 28, 2024
1 parent a89b7da commit 66117d8
Show file tree
Hide file tree
Showing 19 changed files with 80 additions and 8 deletions.
6 changes: 6 additions & 0 deletions .tekton/createctconfig-pull-request.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,8 @@ spec:
value: true
- name: go_test_command
value: go test $(go list ./... | grep -v 'third_party/VENDOR-LICENSE/github.com/letsencrypt/boulder/goodkey')
- name: go_base_image
value: brew.registry.redhat.io/rh-osbs/openshift-golang-builder@sha256:b4242f87696cf168b1fc733a969ef60ee53716dd3c551b02303d76f9d42a53d7
taskRunSpecs:
- pipelineTaskName: prefetch-dependencies
stepSpecs:
Expand All @@ -61,6 +63,10 @@ spec:
limits:
cpu: '3'
memory: 3Gi
serviceAccountName: appstudio-pipeline
podTemplate:
imagePullSecrets:
- name: brew-registry-pull-secret
pipelineRef:
resolver: git
params:
Expand Down
6 changes: 6 additions & 0 deletions .tekton/createctconfig-push.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,8 @@ spec:
value: true
- name: go_test_command
value: go test $(go list ./... | grep -v 'third_party/VENDOR-LICENSE/github.com/letsencrypt/boulder/goodkey')
- name: go_base_image
value: brew.registry.redhat.io/rh-osbs/openshift-golang-builder@sha256:b4242f87696cf168b1fc733a969ef60ee53716dd3c551b02303d76f9d42a53d7
taskRunSpecs:
- pipelineTaskName: prefetch-dependencies
stepSpecs:
Expand All @@ -58,6 +60,10 @@ spec:
limits:
cpu: '3'
memory: 3Gi
serviceAccountName: appstudio-pipeline
podTemplate:
imagePullSecrets:
- name: brew-registry-pull-secret
pipelineRef:
resolver: git
params:
Expand Down
6 changes: 6 additions & 0 deletions .tekton/ctlog-managectroots-pull-request.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,8 @@ spec:
value: true
- name: go_test_command
value: go test $(go list ./... | grep -v 'third_party/VENDOR-LICENSE/github.com/letsencrypt/boulder/goodkey')
- name: go_base_image
value: brew.registry.redhat.io/rh-osbs/openshift-golang-builder@sha256:b4242f87696cf168b1fc733a969ef60ee53716dd3c551b02303d76f9d42a53d7
taskRunSpecs:
- pipelineTaskName: prefetch-dependencies
stepSpecs:
Expand All @@ -61,6 +63,10 @@ spec:
limits:
cpu: '3'
memory: 3Gi
serviceAccountName: appstudio-pipeline
podTemplate:
imagePullSecrets:
- name: brew-registry-pull-secret
pipelineRef:
resolver: git
params:
Expand Down
6 changes: 6 additions & 0 deletions .tekton/ctlog-managectroots-push.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,8 @@ spec:
value: true
- name: go_test_command
value: go test $(go list ./... | grep -v 'third_party/VENDOR-LICENSE/github.com/letsencrypt/boulder/goodkey')
- name: go_base_image
value: brew.registry.redhat.io/rh-osbs/openshift-golang-builder@sha256:b4242f87696cf168b1fc733a969ef60ee53716dd3c551b02303d76f9d42a53d7
taskRunSpecs:
- pipelineTaskName: prefetch-dependencies
stepSpecs:
Expand All @@ -58,6 +60,10 @@ spec:
limits:
cpu: '3'
memory: 3Gi
serviceAccountName: appstudio-pipeline
podTemplate:
imagePullSecrets:
- name: brew-registry-pull-secret
pipelineRef:
resolver: git
params:
Expand Down
6 changes: 6 additions & 0 deletions .tekton/fulcio-createcerts-pull-request.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,8 @@ spec:
value: true
- name: go_test_command
value: go test $(go list ./... | grep -v 'third_party/VENDOR-LICENSE/github.com/letsencrypt/boulder/goodkey')
- name: go_base_image
value: brew.registry.redhat.io/rh-osbs/openshift-golang-builder@sha256:b4242f87696cf168b1fc733a969ef60ee53716dd3c551b02303d76f9d42a53d7
taskRunSpecs:
- pipelineTaskName: prefetch-dependencies
stepSpecs:
Expand All @@ -61,6 +63,10 @@ spec:
limits:
cpu: '3'
memory: 3Gi
serviceAccountName: appstudio-pipeline
podTemplate:
imagePullSecrets:
- name: brew-registry-pull-secret
pipelineRef:
resolver: git
params:
Expand Down
6 changes: 6 additions & 0 deletions .tekton/fulcio-createcerts-push.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,8 @@ spec:
value: true
- name: go_test_command
value: go test $(go list ./... | grep -v 'third_party/VENDOR-LICENSE/github.com/letsencrypt/boulder/goodkey')
- name: go_base_image
value: brew.registry.redhat.io/rh-osbs/openshift-golang-builder@sha256:b4242f87696cf168b1fc733a969ef60ee53716dd3c551b02303d76f9d42a53d7
taskRunSpecs:
- pipelineTaskName: prefetch-dependencies
stepSpecs:
Expand All @@ -58,6 +60,10 @@ spec:
limits:
cpu: '3'
memory: 3Gi
serviceAccountName: appstudio-pipeline
podTemplate:
imagePullSecrets:
- name: brew-registry-pull-secret
pipelineRef:
resolver: git
params:
Expand Down
6 changes: 6 additions & 0 deletions .tekton/trillian-createdb-pull-request.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,8 @@ spec:
value: true
- name: go_test_command
value: go test $(go list ./... | grep -v 'third_party/VENDOR-LICENSE/github.com/letsencrypt/boulder/goodkey')
- name: go_base_image
value: brew.registry.redhat.io/rh-osbs/openshift-golang-builder@sha256:b4242f87696cf168b1fc733a969ef60ee53716dd3c551b02303d76f9d42a53d7
taskRunSpecs:
- pipelineTaskName: prefetch-dependencies
stepSpecs:
Expand All @@ -61,6 +63,10 @@ spec:
limits:
cpu: '3'
memory: 3Gi
serviceAccountName: appstudio-pipeline
podTemplate:
imagePullSecrets:
- name: brew-registry-pull-secret
pipelineRef:
resolver: git
params:
Expand Down
6 changes: 6 additions & 0 deletions .tekton/trillian-createdb-push.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,8 @@ spec:
value: true
- name: go_test_command
value: go test $(go list ./... | grep -v 'third_party/VENDOR-LICENSE/github.com/letsencrypt/boulder/goodkey')
- name: go_base_image
value: brew.registry.redhat.io/rh-osbs/openshift-golang-builder@sha256:b4242f87696cf168b1fc733a969ef60ee53716dd3c551b02303d76f9d42a53d7
taskRunSpecs:
- pipelineTaskName: prefetch-dependencies
stepSpecs:
Expand All @@ -58,6 +60,10 @@ spec:
limits:
cpu: '3'
memory: 3Gi
serviceAccountName: appstudio-pipeline
podTemplate:
imagePullSecrets:
- name: brew-registry-pull-secret
pipelineRef:
resolver: git
params:
Expand Down
6 changes: 6 additions & 0 deletions .tekton/trillian-createtree-pull-request.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,8 @@ spec:
value: true
- name: go_test_command
value: go test $(go list ./... | grep -v 'third_party/VENDOR-LICENSE/github.com/letsencrypt/boulder/goodkey')
- name: go_base_image
value: brew.registry.redhat.io/rh-osbs/openshift-golang-builder@sha256:b4242f87696cf168b1fc733a969ef60ee53716dd3c551b02303d76f9d42a53d7
taskRunSpecs:
- pipelineTaskName: prefetch-dependencies
stepSpecs:
Expand All @@ -61,6 +63,10 @@ spec:
limits:
cpu: '3'
memory: 3Gi
serviceAccountName: appstudio-pipeline
podTemplate:
imagePullSecrets:
- name: brew-registry-pull-secret
pipelineRef:
resolver: git
params:
Expand Down
6 changes: 6 additions & 0 deletions .tekton/trillian-createtree-push.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,8 @@ spec:
value: true
- name: go_test_command
value: go test $(go list ./... | grep -v 'third_party/VENDOR-LICENSE/github.com/letsencrypt/boulder/goodkey')
- name: go_base_image
value: brew.registry.redhat.io/rh-osbs/openshift-golang-builder@sha256:b4242f87696cf168b1fc733a969ef60ee53716dd3c551b02303d76f9d42a53d7
taskRunSpecs:
- pipelineTaskName: prefetch-dependencies
stepSpecs:
Expand All @@ -58,6 +60,10 @@ spec:
limits:
cpu: '3'
memory: 3Gi
serviceAccountName: appstudio-pipeline
podTemplate:
imagePullSecrets:
- name: brew-registry-pull-secret
pipelineRef:
resolver: git
params:
Expand Down
6 changes: 6 additions & 0 deletions .tekton/tuf-server-pull-request.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,8 @@ spec:
value: true
- name: go_test_command
value: go test $(go list ./... | grep -v 'third_party/VENDOR-LICENSE/github.com/letsencrypt/boulder/goodkey')
- name: go_base_image
value: brew.registry.redhat.io/rh-osbs/openshift-golang-builder@sha256:b4242f87696cf168b1fc733a969ef60ee53716dd3c551b02303d76f9d42a53d7
taskRunSpecs:
- pipelineTaskName: prefetch-dependencies
stepSpecs:
Expand All @@ -61,6 +63,10 @@ spec:
limits:
cpu: '3'
memory: 3Gi
serviceAccountName: appstudio-pipeline
podTemplate:
imagePullSecrets:
- name: brew-registry-pull-secret
pipelineRef:
resolver: git
params:
Expand Down
6 changes: 6 additions & 0 deletions .tekton/tuf-server-push.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,8 @@ spec:
value: true
- name: go_test_command
value: go test $(go list ./... | grep -v 'third_party/VENDOR-LICENSE/github.com/letsencrypt/boulder/goodkey')
- name: go_base_image
value: brew.registry.redhat.io/rh-osbs/openshift-golang-builder@sha256:b4242f87696cf168b1fc733a969ef60ee53716dd3c551b02303d76f9d42a53d7
taskRunSpecs:
- pipelineTaskName: prefetch-dependencies
stepSpecs:
Expand All @@ -59,6 +61,10 @@ spec:
limits:
cpu: '3'
memory: 3Gi
serviceAccountName: appstudio-pipeline
podTemplate:
imagePullSecrets:
- name: brew-registry-pull-secret
pipelineRef:
resolver: git
params:
Expand Down
2 changes: 1 addition & 1 deletion Dockerfile.createctconfig.rh
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# Build the createctconfig binary
FROM registry.redhat.io/rhel9/go-toolset@sha256:04be9e51263ab743cbcb778921b23527a3e35d493136fd353a90670d84ac457f AS build-env
FROM brew.registry.redhat.io/rh-osbs/openshift-golang-builder@sha256:b4242f87696cf168b1fc733a969ef60ee53716dd3c551b02303d76f9d42a53d7 AS build-env
WORKDIR /createctconfig
RUN git config --global --add safe.directory /createctconfig

Expand Down
2 changes: 1 addition & 1 deletion Dockerfile.ctlog-managectroots.rh
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# Build the managectroots binary
FROM registry.redhat.io/rhel9/go-toolset@sha256:04be9e51263ab743cbcb778921b23527a3e35d493136fd353a90670d84ac457f AS build-env
FROM brew.registry.redhat.io/rh-osbs/openshift-golang-builder@sha256:b4242f87696cf168b1fc733a969ef60ee53716dd3c551b02303d76f9d42a53d7 AS build-env
WORKDIR /ctlog-managectroots
RUN git config --global --add safe.directory /ctlog-managectroots

Expand Down
2 changes: 1 addition & 1 deletion Dockerfile.ctlog-verifyfulcio.rh
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# Build the verifyfulcio binary
FROM registry.redhat.io/rhel9/go-toolset@sha256:04be9e51263ab743cbcb778921b23527a3e35d493136fd353a90670d84ac457f AS build-env
FROM brew.registry.redhat.io/rh-osbs/openshift-golang-builder@sha256:b4242f87696cf168b1fc733a969ef60ee53716dd3c551b02303d76f9d42a53d7 AS build-env
WORKDIR /ctlog-verifyfulcio
RUN git config --global --add safe.directory /ctlog-verifyfulcio

Expand Down
2 changes: 1 addition & 1 deletion Dockerfile.fulcio-createcerts.rh
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# Build the createcerts binary
FROM registry.redhat.io/rhel9/go-toolset@sha256:04be9e51263ab743cbcb778921b23527a3e35d493136fd353a90670d84ac457f AS build-env
FROM brew.registry.redhat.io/rh-osbs/openshift-golang-builder@sha256:b4242f87696cf168b1fc733a969ef60ee53716dd3c551b02303d76f9d42a53d7 AS build-env
WORKDIR /createcerts
RUN git config --global --add safe.directory /createcerts

Expand Down
2 changes: 1 addition & 1 deletion Dockerfile.trillian-createdb.rh
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# Build the createdb binary
FROM registry.redhat.io/rhel9/go-toolset@sha256:04be9e51263ab743cbcb778921b23527a3e35d493136fd353a90670d84ac457f AS build-env
FROM brew.registry.redhat.io/rh-osbs/openshift-golang-builder@sha256:b4242f87696cf168b1fc733a969ef60ee53716dd3c551b02303d76f9d42a53d7 AS build-env
WORKDIR /createdb
RUN git config --global --add safe.directory /createdb

Expand Down
2 changes: 1 addition & 1 deletion Dockerfile.trillian-createtree.rh
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# Build the createtree binary
FROM registry.redhat.io/rhel9/go-toolset@sha256:04be9e51263ab743cbcb778921b23527a3e35d493136fd353a90670d84ac457f AS build-env
FROM brew.registry.redhat.io/rh-osbs/openshift-golang-builder@sha256:b4242f87696cf168b1fc733a969ef60ee53716dd3c551b02303d76f9d42a53d7 AS build-env
WORKDIR /createtree
RUN git config --global --add safe.directory /createtree

Expand Down
4 changes: 2 additions & 2 deletions Dockerfile.tuf-server.rh
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# Build the tuf server binary
FROM registry.redhat.io/rhel9/go-toolset@sha256:04be9e51263ab743cbcb778921b23527a3e35d493136fd353a90670d84ac457f AS build-env
FROM brew.registry.redhat.io/rh-osbs/openshift-golang-builder@sha256:b4242f87696cf168b1fc733a969ef60ee53716dd3c551b02303d76f9d42a53d7 AS build-env
WORKDIR /tuf-server
RUN git config --global --add safe.directory /tuf-server

Expand All @@ -9,7 +9,7 @@ RUN go mod vendor
RUN make build-tuf-server

# Install server
FROM registry.access.redhat.com/ubi9-minimal@sha256:1b6d711648229a1c987f39cfdfccaebe2bd92d0b5d8caa5dbaa5234a9278a0b2
FROM registry.access.redhat.com/ubi9-minimal@sha256:8b6978d555746877c73f52375f60fd7b6fd27d6aca000eaed27d0995303c13de
COPY --from=build-env /tuf-server/server /usr/local/bin/tuf-server
RUN chown root:0 /usr/local/bin/tuf-server && chmod g+wx /usr/local/bin/tuf-server

Expand Down

0 comments on commit 66117d8

Please sign in to comment.