Skip to content

Commit cf20ed6

Browse files
ondrejbudaibcl
authored andcommitted
Containerfile*: remove the GOPROXY override
Fedora 43 reverted the patch to use GOPROXY=direct, and it now follows the standard https://proxy.golang.org,direct, so we can remove it from our Containerfiles. See https://fedoraproject.org/wiki/Changes/golang1.25
1 parent 49cab97 commit cf20ed6

File tree

3 files changed

+0
-6
lines changed

3 files changed

+0
-6
lines changed

Containerfile

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,5 @@
11
FROM registry.fedoraproject.org/fedora:43 AS builder
22
RUN dnf install -y git-core golang gpgme-devel libassuan-devel && mkdir -p /build/
3-
ARG GOPROXY=https://proxy.golang.org,direct
4-
RUN go env -w GOPROXY=$GOPROXY
53
WORKDIR /build
64
COPY go.mod go.sum ./
75
RUN go mod download

Containerfile.bib

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,6 @@
11
FROM registry.fedoraproject.org/fedora:43 AS builder
22
RUN dnf install -y git-core golang gpgme-devel libassuan-devel libvirt-devel && mkdir -p /build/bib
33
COPY go.mod go.sum /build/bib/
4-
ARG GOPROXY=https://proxy.golang.org,direct
5-
RUN go env -w GOPROXY=$GOPROXY
64
RUN cd /build/bib && go mod download
75
# Copy the entire dir to avoid having to conditionally include ".git" as that
86
# will not be available when tests are run under tmt

devel/Containerfile

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,5 @@
11
FROM registry.fedoraproject.org/fedora:43 AS builder
22
RUN dnf install -y git-core golang gpgme-devel libassuan-devel libvirt-devel && mkdir -p /build/bib
3-
ARG GOPROXY=https://proxy.golang.org,direct
4-
RUN go env -w GOPROXY=$GOPROXY
53
## Run with --build-context=images=../images to build with local changes
64
COPY --from=images . /images
75
COPY . /build

0 commit comments

Comments
 (0)