Skip to content

Commit

Permalink
Update go-toolset to latest
Browse files Browse the repository at this point in the history
And set go version to 1.20 in go.mod since we have go 1.20 now.
  • Loading branch information
chmouel committed Nov 8, 2023
1 parent e07e441 commit dff3b3a
Show file tree
Hide file tree
Showing 5 changed files with 14 additions and 14 deletions.
2 changes: 1 addition & 1 deletion .tekton/e2e-tests.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ spec:
workspaces:
- name: source
steps:
- image: registry.access.redhat.com/ubi9/go-toolset@sha256:82d9bc5d3ceb43635288880f26207201e55d1c688a60ebbfff4f54d4963a62a1
- image: registry.access.redhat.com/ubi9/go-toolset@sha256:9a0f860e143f2f771bee92ab3b0161e10e2390370152e07e6bcf8105242cee13
env:
- name: GOCACHE
value: $(workspaces.source.path)/go-build-cache/cache
Expand Down
6 changes: 3 additions & 3 deletions .tekton/generate-coverage-release.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ spec:
workspaces:
- name: source
steps:
- image: registry.access.redhat.com/ubi9/go-toolset@sha256:82d9bc5d3ceb43635288880f26207201e55d1c688a60ebbfff4f54d4963a62a1
- image: registry.access.redhat.com/ubi9/go-toolset@sha256:9a0f860e143f2f771bee92ab3b0161e10e2390370152e07e6bcf8105242cee13
name: get-cache
workingDir: $(workspaces.source.path)
env:
Expand All @@ -64,7 +64,7 @@ spec:
curl http://uploader:8080/golang-cache.tar.gz|tar -z -x -f- || \
curl -X DELETE -F "file=golang-cache.tar.gz" http://uploader:8080/upload
- name: unittest
image: registry.access.redhat.com/ubi9/go-toolset@sha256:82d9bc5d3ceb43635288880f26207201e55d1c688a60ebbfff4f54d4963a62a1
image: registry.access.redhat.com/ubi9/go-toolset@sha256:9a0f860e143f2f771bee92ab3b0161e10e2390370152e07e6bcf8105242cee13
workingDir: $(workspaces.source.path)
env:
- name: GOCACHE
Expand All @@ -87,7 +87,7 @@ spec:
steps:
- name: codecov-run
# Has everything we need in there and we already fetched it!
image: registry.access.redhat.com/ubi9/go-toolset@sha256:82d9bc5d3ceb43635288880f26207201e55d1c688a60ebbfff4f54d4963a62a1
image: registry.access.redhat.com/ubi9/go-toolset@sha256:9a0f860e143f2f771bee92ab3b0161e10e2390370152e07e6bcf8105242cee13
workingDir: $(workspaces.source.path)
env:
- name: CODECOV_TOKEN
Expand Down
6 changes: 3 additions & 3 deletions .tekton/go.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ spec:
workspaces:
- name: source
steps:
- image: registry.access.redhat.com/ubi9/go-toolset@sha256:82d9bc5d3ceb43635288880f26207201e55d1c688a60ebbfff4f54d4963a62a1
- image: registry.access.redhat.com/ubi9/go-toolset@sha256:9a0f860e143f2f771bee92ab3b0161e10e2390370152e07e6bcf8105242cee13
env:
- name: GOCACHE
value: $(workspaces.source.path)/go-build-cache/cache
Expand Down Expand Up @@ -72,7 +72,7 @@ spec:
- name: unittest
# we get bumped out when usingh the official image with docker.io
# ratelimit so workaround this.
image: registry.access.redhat.com/ubi9/go-toolset@sha256:82d9bc5d3ceb43635288880f26207201e55d1c688a60ebbfff4f54d4963a62a1
image: registry.access.redhat.com/ubi9/go-toolset@sha256:9a0f860e143f2f771bee92ab3b0161e10e2390370152e07e6bcf8105242cee13
env:
- name: GOCACHE
value: $(workspaces.source.path)/go-build-cache/cache
Expand All @@ -89,7 +89,7 @@ spec:
- name: coverage
# we get bumped out when usingh the official image with docker.io
# ratelimit so workaround this.
image: registry.access.redhat.com/ubi9/go-toolset@sha256:82d9bc5d3ceb43635288880f26207201e55d1c688a60ebbfff4f54d4963a62a1
image: registry.access.redhat.com/ubi9/go-toolset@sha256:9a0f860e143f2f771bee92ab3b0161e10e2390370152e07e6bcf8105242cee13
env:
- name: CODECOV_TOKEN
valueFrom:
Expand Down
12 changes: 6 additions & 6 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,19 +1,19 @@
FROM registry.access.redhat.com/ubi9/go-toolset@sha256:82d9bc5d3ceb43635288880f26207201e55d1c688a60ebbfff4f54d4963a62a1 AS builder
FROM registry.access.redhat.com/ubi9/go-toolset@sha256:9a0f860e143f2f771bee92ab3b0161e10e2390370152e07e6bcf8105242cee13 AS builder

ARG BINARY_NAME=pipelines-as-code-controller
COPY . /src
WORKDIR /src
RUN \
git config --global --add safe.directory /src && \
make /tmp/${BINARY_NAME} LDFLAGS="-s -w" OUTPUT_DIR=/tmp
git config --global --add safe.directory /src && \
make /tmp/${BINARY_NAME} LDFLAGS="-s -w" OUTPUT_DIR=/tmp

FROM registry.access.redhat.com/ubi9/ubi-minimal

ARG BINARY_NAME=pipelines-as-code-controller
LABEL com.redhat.component=${BINARY_NAME} \
name=openshift-pipelines/${BINARY_NAME} \
[email protected] \
summary="This image is to run Pipelines as Code ${BINARY_NAME} component"
name=openshift-pipelines/${BINARY_NAME} \
[email protected] \
summary="This image is to run Pipelines as Code ${BINARY_NAME} component"

COPY --from=builder /tmp/${BINARY_NAME} /usr/bin/${BINARY_NAME}

Expand Down
2 changes: 1 addition & 1 deletion go.mod
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
module github.com/openshift-pipelines/pipelines-as-code

go 1.19
go 1.20

require (
code.gitea.io/sdk/gitea v0.16.0
Expand Down

0 comments on commit dff3b3a

Please sign in to comment.