Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

NO-ISSUE: Bump openshift/release from golang-1.16 to golang-1.17 #1

Closed
wants to merge 1 commit into from
Closed

NO-ISSUE: Bump openshift/release from golang-1.16 to golang-1.17 #1

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions Dockerfile.assisted-service
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ COPY tools/generate_python_client.sh .
RUN chmod +x ./generate_python_client.sh && SWAGGER_FILE=swagger.yaml OUTPUT=/build ./generate_python_client.sh

# TODO: Find a pure Python3 base image, rather than relying on the golang one
FROM registry.ci.openshift.org/openshift/release:golang-1.16 as pybuilder
FROM registry.ci.openshift.org/openshift/release:golang-1.17 as pybuilder
COPY . /assisted-service
COPY --from=swagger_py /build /assisted-service/build
RUN python3 -m pip install -I pip && pip3 install -I -r /assisted-service/dev-requirements.txt
Expand All @@ -14,7 +14,7 @@ RUN cd /assisted-service/build && python3 ../tools/client_package_initializer.py
# TODO: Currently, the Python package is included in the service image for testing purposes. It conveniently allows matching a service version to a specific Python client version. In the future, once the Python package is published on pip, it should (probably) be removed from the Assisted Service image (this dockerfile).

# Build binaries
FROM registry.ci.openshift.org/openshift/release:golang-1.16 as builder
FROM registry.ci.openshift.org/openshift/release:golang-1.17 as builder
# Bring in the go dependencies before anything else so we can take
# advantage of caching these layers in future builds.
COPY go.mod go.mod
Expand Down
2 changes: 1 addition & 1 deletion Dockerfile.assisted-service-debug
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
ARG SERVICE=quay.io/ocpmetal/assisted-service:latest
FROM registry.ci.openshift.org/openshift/release:golang-1.16 AS download_dlv
FROM registry.ci.openshift.org/openshift/release:golang-1.17 AS download_dlv
RUN go get github.com/go-delve/delve/cmd/dlv

FROM $SERVICE
Expand Down
2 changes: 1 addition & 1 deletion Dockerfile.bundle
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM registry.ci.openshift.org/openshift/release:golang-1.16 as build
FROM registry.ci.openshift.org/openshift/release:golang-1.17 as build

ENV GO111MODULE=on
ENV GOFLAGS=""
Expand Down