Skip to content

Commit a48db94

Browse files
AlliBalliBabadunglas
AlliBalliBaba
and
dunglas
authored
fix: go toolchain versioning (#1545)
* Removes toolchain requirements. * trigger * Removes explicit calls to go get * trigger * Update static-builder-musl.Dockerfile Co-authored-by: Kévin Dunglas <kevin@dunglas.fr> * Update static-builder-musl.Dockerfile Co-authored-by: Kévin Dunglas <kevin@dunglas.fr> * Update static-builder-gnu.Dockerfile Co-authored-by: Kévin Dunglas <kevin@dunglas.fr> * Update alpine.Dockerfile Co-authored-by: Kévin Dunglas <kevin@dunglas.fr> * Update Dockerfile Co-authored-by: Kévin Dunglas <kevin@dunglas.fr> * Update Dockerfile Co-authored-by: Kévin Dunglas <kevin@dunglas.fr> * Update alpine.Dockerfile Co-authored-by: Kévin Dunglas <kevin@dunglas.fr> * trigger * trigger --------- Co-authored-by: Alliballibaba <alliballibaba@gmail.com> Co-authored-by: Kévin Dunglas <kevin@dunglas.fr>
1 parent ab0fcd8 commit a48db94

5 files changed

Lines changed: 7 additions & 10 deletions

File tree

‎Dockerfile‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -93,11 +93,11 @@ RUN curl -s https://api.github.com/repos/e-dant/watcher/releases/latest | \
9393
WORKDIR /go/src/app
9494

9595
COPY --link go.mod go.sum ./
96-
RUN go mod graph | awk '{if ($1 !~ "@") print $2}' | xargs go get
96+
RUN go mod download
9797

9898
WORKDIR /go/src/app/caddy
9999
COPY --link caddy/go.mod caddy/go.sum ./
100-
RUN go mod graph | awk '{if ($1 !~ "@") print $2}' | xargs go get
100+
RUN go mod download
101101

102102
WORKDIR /go/src/app
103103
COPY --link . ./

‎alpine.Dockerfile‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -98,11 +98,11 @@ RUN curl -s https://api.github.com/repos/e-dant/watcher/releases/latest | \
9898
WORKDIR /go/src/app
9999

100100
COPY --link go.mod go.sum ./
101-
RUN go mod graph | awk '{if ($1 !~ "@") print $2}' | xargs go get
101+
RUN go mod download
102102

103103
WORKDIR /go/src/app/caddy
104104
COPY caddy/go.mod caddy/go.sum ./
105-
RUN go mod graph | awk '{if ($1 !~ "@") print $2}' | xargs go get
105+
RUN go mod download
106106

107107
WORKDIR /go/src/app
108108
COPY --link . ./

‎go.mod‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,6 @@ module github.com/dunglas/frankenphp
22

33
go 1.24
44

5-
toolchain go1.24.2
6-
75
retract v1.0.0-rc.1 // Human error
86

97
require (

‎static-builder-gnu.Dockerfile‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -123,11 +123,10 @@ ENV COMPOSER_ALLOW_SUPERUSER=1
123123

124124
WORKDIR /go/src/app
125125
COPY go.mod go.sum ./
126-
RUN go mod graph | awk '{if ($1 !~ "@") print $2}' | xargs go get
126+
RUN go mod download
127127

128128
WORKDIR /go/src/app/caddy
129129
COPY caddy/go.mod caddy/go.sum ./
130-
RUN go mod graph | awk '{if ($1 !~ "@") print $2}' | xargs go get
131130

132131
WORKDIR /go/src/app
133132
COPY --link *.* ./

‎static-builder-musl.Dockerfile‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -81,11 +81,11 @@ COPY --from=composer/composer:2-bin /composer /usr/bin/composer
8181

8282
WORKDIR /go/src/app
8383
COPY go.mod go.sum ./
84-
RUN go mod graph | awk '{if ($1 !~ "@") print $2}' | xargs go get
84+
RUN go mod download
8585

8686
WORKDIR /go/src/app/caddy
8787
COPY caddy/go.mod caddy/go.sum ./
88-
RUN go mod graph | awk '{if ($1 !~ "@") print $2}' | xargs go get
88+
RUN go mod download
8989

9090
WORKDIR /go/src/app
9191
COPY --link . ./

0 commit comments

Comments
 (0)