Skip to content

Commit c14d7f6

Browse files
committed
fix
1 parent a8665d8 commit c14d7f6

3 files changed

Lines changed: 5 additions & 5 deletions

File tree

Dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,7 @@ COPY --link caddy/go.mod caddy/go.sum ./
100100
RUN go mod graph | awk '{if ($1 !~ "@") print $2}' | xargs go get
101101

102102
WORKDIR /go/src/app
103-
COPY --link . .
103+
ADD --link . ./
104104

105105
# See https://github.com/docker-library/php/blob/master/8.3/bookworm/zts/Dockerfile#L57-L59 for PHP values
106106
ENV CGO_CFLAGS="-DFRANKENPHP_VERSION=$FRANKENPHP_VERSION $PHP_CFLAGS"
@@ -110,7 +110,7 @@ ENV CGO_LDFLAGS="-L/usr/local/lib -lssl -lcrypto -lreadline -largon2 -lcurl -lon
110110
RUN echo $CGO_LDFLAGS
111111

112112
WORKDIR /go/src/app/caddy/frankenphp
113-
RUN git status && GOBIN=/usr/local/bin go install -tags 'nobadger,nomysql,nopgx' -ldflags "-w -s -X 'github.com/caddyserver/caddy/v2.CustomVersion=FrankenPHP $FRANKENPHP_VERSION PHP $PHP_VERSION Caddy'" -buildvcs=true && \
113+
RUN GOBIN=/usr/local/bin go install -tags 'nobadger,nomysql,nopgx' -ldflags "-w -s -X 'github.com/caddyserver/caddy/v2.CustomVersion=FrankenPHP $FRANKENPHP_VERSION PHP $PHP_VERSION Caddy'" -buildvcs=true && \
114114
setcap cap_net_bind_service=+ep /usr/local/bin/frankenphp && \
115115
cp Caddyfile /etc/caddy/Caddyfile && \
116116
frankenphp version

alpine.Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -105,7 +105,7 @@ COPY caddy/go.mod caddy/go.sum ./
105105
RUN go mod graph | awk '{if ($1 !~ "@") print $2}' | xargs go get
106106

107107
WORKDIR /go/src/app
108-
COPY --link . .
108+
ADD --link . ./
109109

110110
# See https://github.com/docker-library/php/blob/master/8.3/alpine3.20/zts/Dockerfile#L53-L55
111111
ENV CGO_CFLAGS="-DFRANKENPHP_VERSION=$FRANKENPHP_VERSION $PHP_CFLAGS"

static-builder.Dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@ COPY caddy/go.mod caddy/go.sum ./
8888
RUN go mod graph | awk '{if ($1 !~ "@") print $2}' | xargs go get
8989

9090
WORKDIR /go/src/app
91-
COPY --link . .
91+
ADD --link . ./
9292

93-
RUN --mount=type=secret,id=github-token GITHUB_TOKEN=$(cat /run/secrets/github-token) ./build-static.sh && git status \
93+
RUN --mount=type=secret,id=github-token GITHUB_TOKEN=$(cat /run/secrets/github-token) ./build-static.sh && git status && \
9494
rm -Rf dist/static-php-cli/source/*

0 commit comments

Comments
 (0)