Skip to content

Commit effca01

Browse files
authored
Merge pull request #44 from amadhusu/RHOAIENG-7423-1.18
UPSTREAM:<carry>:chore:RHOAIENG-7423 - Updated ubi8 image and go-toolset version
2 parents 25f33aa + ea12783 commit effca01

5 files changed

+12
-12
lines changed

backend/Dockerfile

+2-2
Original file line numberDiff line numberDiff line change
@@ -34,8 +34,8 @@ COPY ${SOURCE_CODE}/ ./
3434
RUN GO111MODULE=on go build -o /bin/apiserver ./backend/src/apiserver/ && \
3535
dnf clean all
3636

37-
#@follow_tag(registry.access.redhat.com/ubi8/ubi-minimal:8.9)
38-
FROM registry.access.redhat.com/ubi8/ubi-minimal:8.9
37+
#@follow_tag(registry.access.redhat.com/ubi8/ubi-minimal:latest)
38+
FROM registry.access.redhat.com/ubi8/ubi-minimal:latest
3939

4040
WORKDIR /bin
4141

backend/Dockerfile.driver

+2-2
Original file line numberDiff line numberDiff line change
@@ -34,8 +34,8 @@ COPY ${SOURCE_CODE}/ ./
3434

3535
RUN GO111MODULE=on CGO_ENABLED=0 GOOS=linux GOARCH=amd64 go build -tags netgo -ldflags '-extldflags "-static"' -o /bin/driver ./backend/src/v2/cmd/driver/*.go
3636

37-
#@follow_tag(registry.access.redhat.com/ubi8/ubi-minimal:8.9)
38-
FROM registry.access.redhat.com/ubi8/ubi-minimal:8.9
37+
#@follow_tag(registry.access.redhat.com/ubi8/ubi-minimal:latest)
38+
FROM registry.access.redhat.com/ubi8/ubi-minimal:latest
3939

4040
WORKDIR /bin
4141

backend/Dockerfile.launcher

+2-2
Original file line numberDiff line numberDiff line change
@@ -36,8 +36,8 @@ COPY ${SOURCE_CODE}/ ./
3636

3737
RUN GO111MODULE=on CGO_ENABLED=0 GOOS=linux GOARCH=amd64 go build -tags netgo -ldflags '-extldflags "-static"' -o /bin/launcher-v2 ./backend/src/v2/cmd/launcher-v2/*.go
3838

39-
#@follow_tag(registry.access.redhat.com/ubi8/ubi-minimal:8.9)
40-
FROM registry.access.redhat.com/ubi8/ubi-minimal:8.9
39+
#@follow_tag(registry.access.redhat.com/ubi8/ubi-minimal:latest)
40+
FROM registry.access.redhat.com/ubi8/ubi-minimal:latest
4141

4242
WORKDIR /bin
4343

backend/Dockerfile.persistenceagent

+2-2
Original file line numberDiff line numberDiff line change
@@ -36,8 +36,8 @@ COPY ${SOURCE_CODE}/ ./
3636

3737
RUN GO111MODULE=on go build -o /bin/persistence_agent backend/src/agent/persistence/*.go
3838

39-
#@follow_tag(registry.access.redhat.com/ubi8/ubi-minimal:8.9)
40-
FROM registry.access.redhat.com/ubi8/ubi-minimal:8.9
39+
#@follow_tag(registry.access.redhat.com/ubi8/ubi-minimal:latest)
40+
FROM registry.access.redhat.com/ubi8/ubi-minimal:latest
4141
WORKDIR /bin
4242

4343
COPY --from=builder /bin/persistence_agent /bin/persistence_agent

backend/Dockerfile.scheduledworkflow

+4-4
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,8 @@
1616
ARG SOURCE_CODE=.
1717

1818
# Use ubi8/nodejs-14 as base image
19-
#@follow_tag(registry.access.redhat.com/ubi8/go-toolset:1.19)
20-
FROM registry.access.redhat.com/ubi8/go-toolset:1.19 as builder
19+
#@follow_tag(registry.access.redhat.com/ubi8/go-toolset:1.20)
20+
FROM registry.access.redhat.com/ubi8/go-toolset:1.20 as builder
2121

2222
## Build args to be used at this step
2323
ARG SOURCE_CODE
@@ -41,8 +41,8 @@ COPY ${SOURCE_CODE}/ ./
4141

4242
RUN GO111MODULE=on go build -o /bin/controller backend/src/crd/controller/scheduledworkflow/*.go
4343

44-
#@follow_tag(registry.access.redhat.com/ubi8/ubi-minimal:8.8)
45-
FROM registry.access.redhat.com/ubi8/ubi-minimal:8.8
44+
#@follow_tag(registry.access.redhat.com/ubi8/ubi-minimal:latest)
45+
FROM registry.access.redhat.com/ubi8/ubi-minimal:latest
4646
WORKDIR /bin
4747

4848
COPY --from=builder /bin/controller /bin/controller

0 commit comments

Comments
 (0)