diff options
| author | Paul Holzinger <pholzing@redhat.com> | 2022-06-22 13:33:37 +0200 |
|---|---|---|
| committer | Paul Holzinger <pholzing@redhat.com> | 2022-06-23 18:36:23 +0200 |
| commit | fcc25afa55a57629359c4aac5864883b00eb15ba (patch) | |
| tree | be68f729c6db0e4c65bb35430d5eda41bea48a7d | |
| parent | 472f79f08e2fbb0fcc07abbe6fed221e18a4f36f (diff) | |
| download | podman-fcc25afa55a57629359c4aac5864883b00eb15ba.tar.gz podman-fcc25afa55a57629359c4aac5864883b00eb15ba.tar.bz2 podman-fcc25afa55a57629359c4aac5864883b00eb15ba.zip | |
test/testvol: update container image golang to 1.18
Update the golang verion for the testvol image to the latest version
1.18. This requires us to build with GO111MODULE=off.
Use the FQDN to prevent the shortnames prompt.
Also add --network none to the podman build command to make sure we are
only using the copied deps and nothing else.
Signed-off-by: Paul Holzinger <pholzing@redhat.com>
| -rw-r--r-- | Makefile | 2 | ||||
| -rw-r--r-- | test/testvol/Containerfile | 4 |
2 files changed, 3 insertions, 3 deletions
@@ -229,7 +229,7 @@ test/testvol/testvol: $(wildcard test/testvol/*.go) .PHONY: volume-plugin-test-img volume-plugin-test-img: - podman build -t quay.io/libpod/volume-plugin-test-img:$$(date +%Y%m%d) -f ./test/testvol/Containerfile . + ./bin/podman build --network none -t quay.io/libpod/volume-plugin-test-img:$$(date +%Y%m%d) -f ./test/testvol/Containerfile . .PHONY: test/goecho/goecho test/goecho/goecho: $(wildcard test/goecho/*.go) diff --git a/test/testvol/Containerfile b/test/testvol/Containerfile index 6ff45064b..de44798fe 100644 --- a/test/testvol/Containerfile +++ b/test/testvol/Containerfile @@ -1,8 +1,8 @@ -FROM golang:1.15-alpine AS build-img +FROM docker.io/library/golang:1.18-alpine AS build-img COPY ./test/testvol/ /go/src/github.com/containers/podman/cmd/testvol/ COPY ./vendor /go/src/github.com/containers/podman/vendor/ WORKDIR /go/src/github.com/containers/podman -RUN go build -o /testvol ./cmd/testvol +RUN GO111MODULE=off go build -o /testvol ./cmd/testvol FROM alpine COPY --from=build-img /testvol /usr/local/bin |