Skip to content

Commit 2532eb5

Browse files
dunglasdunglas
authored
chore: compile without nosql's support for Postgres and MySQL (#1112)
1 parent 17e5728 commit 2532eb5

File tree

10 files changed

+18
-15
lines changed

10 files changed

+18
-15
lines changed

‎.github/workflows/docker.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -213,7 +213,7 @@ jobs:
213213
run: |
214214
docker run --platform=${{ matrix.platform }} --rm \
215215
"$(jq -r '."builder-${{ matrix.variant }}"."containerimage.config.digest"' <<< "${METADATA}")" \
216-
sh -c 'go test -tags watcher ${{ matrix.race }} -v ./... && cd caddy && go test -tags watcher ${{ matrix.race }} -v ./...'
216+
sh -c 'go test -tags watcher ${{ matrix.race }} -v ./... && cd caddy && go test -tags watcher,brotli,nobadger,nomysql,nopgx ${{ matrix.race }} -v ./...'
217217
env:
218218
METADATA: ${{ steps.build.outputs.metadata }}
219219
# Adapted from https://docs.docker.com/build/ci/github-actions/multi-platform/

‎.github/workflows/tests.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ jobs:
7575
-
7676
name: Run Caddy module tests
7777
working-directory: caddy/
78-
run: go test -tags watcher -race -v ./...
78+
run: go test -tags watcher,brotli,nobadger,nomysql,nopgx -race -v ./...
7979
-
8080
name: Build the server
8181
working-directory: caddy/frankenphp/

‎CONTRIBUTING.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ Build Caddy with the FrankenPHP Caddy module:
3838

3939
```console
4040
cd caddy/frankenphp/
41-
go build
41+
go build -tags watcher,brotli,nobadger,nomysql,nopgx
4242
cd ../../
4343
```
4444

‎Dockerfile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -104,7 +104,7 @@ ENV CGO_CPPFLAGS=$PHP_CPPFLAGS
104104
ENV CGO_LDFLAGS="-lssl -lcrypto -lreadline -largon2 -lcurl -lonig -lz $PHP_LDFLAGS"
105105

106106
WORKDIR /go/src/app/caddy/frankenphp
107-
RUN GOBIN=/usr/local/bin go install -tags 'brotli watcher' -ldflags "-w -s -X 'github.com/caddyserver/caddy/v2.CustomVersion=FrankenPHP $FRANKENPHP_VERSION PHP $PHP_VERSION Caddy'" && \
107+
RUN GOBIN=/usr/local/bin go install -tags 'brotli,watcher,nobadger,nomysql,nopgx' -ldflags "-w -s -X 'github.com/caddyserver/caddy/v2.CustomVersion=FrankenPHP $FRANKENPHP_VERSION PHP $PHP_VERSION Caddy'" && \
108108
setcap cap_net_bind_service=+ep /usr/local/bin/frankenphp && \
109109
cp Caddyfile /etc/caddy/Caddyfile && \
110110
frankenphp version

‎alpine.Dockerfile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -125,7 +125,7 @@ ENV CGO_CPPFLAGS=$PHP_CPPFLAGS
125125
ENV CGO_LDFLAGS="-lssl -lcrypto -lreadline -largon2 -lcurl -lonig -lz $PHP_LDFLAGS"
126126

127127
WORKDIR /go/src/app/caddy/frankenphp
128-
RUN GOBIN=/usr/local/bin go install -tags 'brotli watcher' -ldflags "-w -s -extldflags '-Wl,-z,stack-size=0x80000' -X 'github.com/caddyserver/caddy/v2.CustomVersion=FrankenPHP $FRANKENPHP_VERSION PHP $PHP_VERSION Caddy'" && \
128+
RUN GOBIN=/usr/local/bin go install -tags 'brotli,watcher,nobadger,nomysql,nopgx' -ldflags "-w -s -extldflags '-Wl,-z,stack-size=0x80000' -X 'github.com/caddyserver/caddy/v2.CustomVersion=FrankenPHP $FRANKENPHP_VERSION PHP $PHP_VERSION Caddy'" && \
129129
setcap cap_net_bind_service=+ep /usr/local/bin/frankenphp && \
130130
upx --best /usr/local/bin/frankenphp && \
131131
frankenphp version

‎build-static.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -249,7 +249,7 @@ fi
249249
250250
cd caddy/frankenphp/
251251
go env
252-
go build -buildmode=pie -tags "cgo netgo osusergo static_build brotli watcher" -ldflags "-linkmode=external -extldflags '-static-pie ${extraExtldflags}' ${extraLdflags} -X 'github.com/caddyserver/caddy/v2.CustomVersion=FrankenPHP ${FRANKENPHP_VERSION} PHP ${LIBPHP_VERSION} Caddy'" -o "../../dist/${bin}"
252+
go build -buildmode=pie -tags "cgo,netgo,osusergo,static_build,brotli,watcher,nobadger,nomysql,nopgx" -ldflags "-linkmode=external -extldflags '-static-pie ${extraExtldflags}' ${extraLdflags} -X 'github.com/caddyserver/caddy/v2.CustomVersion=FrankenPHP ${FRANKENPHP_VERSION} PHP ${LIBPHP_VERSION} Caddy'" -o "../../dist/${bin}"
253253
cd ../..
254254
255255
if [ -d "${EMBED}" ]; then

‎dev.Dockerfile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@ WORKDIR /go/src/app
7878
COPY . .
7979

8080
WORKDIR /go/src/app/caddy/frankenphp
81-
RUN go build -buildvcs=false -tags 'brotli watcher'
81+
RUN go build -buildvcs=false -tags 'brotli,watcher,nobadger,nomysql,nopgx'
8282

8383
WORKDIR /go/src/app
8484
CMD [ "zsh" ]

‎docs/compile.md‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -109,11 +109,14 @@ passing additional build tags to the Go compiler:
109109
When using `go build` directly, pass the additional `-tags` option followed by the comma-separated list of tags:
110110

111111
```console
112-
go build -tags 'brotli watcher'
112+
go build -tags 'nobadger,nomysql,nopgx,brotli,watcher'
113113
```
114114

115+
> [!NOTE]
116+
> You should always pass the `nobadger,nomysql,nopgx` tags to disable unused features of the SmallStep nosql dependency.
117+
115118
When using `xcaddy`, set the `-tags` option in the `XCADDY_GO_BUILD_FLAGS` environment variable:
116119

117120
```console
118-
XCADDY_GO_BUILD_FLAGS="-tags 'brotli watcher'"
121+
XCADDY_GO_BUILD_FLAGS="-tags 'brotli,watcher'"
119122
```

‎go.mod‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ require (
99
github.com/prometheus/client_golang v1.20.5
1010
github.com/stretchr/testify v1.9.0
1111
go.uber.org/zap v1.27.0
12-
golang.org/x/net v0.29.0
12+
golang.org/x/net v0.30.0
1313
)
1414

1515
require (
@@ -26,7 +26,7 @@ require (
2626
github.com/rogpeppe/go-internal v1.12.0 // indirect
2727
go.uber.org/multierr v1.11.0 // indirect
2828
golang.org/x/sys v0.26.0 // indirect
29-
golang.org/x/text v0.18.0 // indirect
29+
golang.org/x/text v0.19.0 // indirect
3030
google.golang.org/protobuf v1.35.1 // indirect
3131
gopkg.in/yaml.v3 v3.0.1 // indirect
3232
)

‎go.sum‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -40,12 +40,12 @@ go.uber.org/multierr v1.11.0 h1:blXXJkSxSSfBVBlC76pxqeO+LN3aDfLQo+309xJstO0=
4040
go.uber.org/multierr v1.11.0/go.mod h1:20+QtiLqy0Nd6FdQB9TLXag12DsQkrbs3htMFfDN80Y=
4141
go.uber.org/zap v1.27.0 h1:aJMhYGrd5QSmlpLMr2MftRKl7t8J8PTZPA732ud/XR8=
4242
go.uber.org/zap v1.27.0/go.mod h1:GB2qFLM7cTU87MWRP2mPIjqfIDnGu+VIO4V/SdhGo2E=
43-
golang.org/x/net v0.29.0 h1:5ORfpBpCs4HzDYoodCDBbwHzdR5UrLBZ3sOnUJmFoHo=
44-
golang.org/x/net v0.29.0/go.mod h1:gLkgy8jTGERgjzMic6DS9+SP0ajcu6Xu3Orq/SpETg0=
43+
golang.org/x/net v0.30.0 h1:AcW1SDZMkb8IpzCdQUaIq2sP4sZ4zw+55h6ynffypl4=
44+
golang.org/x/net v0.30.0/go.mod h1:2wGyMJ5iFasEhkwi13ChkO/t1ECNC4X4eBKkVFyYFlU=
4545
golang.org/x/sys v0.26.0 h1:KHjCJyddX0LoSTb3J+vWpupP9p0oznkqVk/IfjymZbo=
4646
golang.org/x/sys v0.26.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
47-
golang.org/x/text v0.18.0 h1:XvMDiNzPAl0jr17s6W9lcaIhGUfUORdGCNsuLmPG224=
48-
golang.org/x/text v0.18.0/go.mod h1:BuEKDfySbSR4drPmRPG/7iBdf8hvFMuRexcpahXilzY=
47+
golang.org/x/text v0.19.0 h1:kTxAhCbGbxhK0IwgSKiMO5awPoDQ0RpfiVYBfK860YM=
48+
golang.org/x/text v0.19.0/go.mod h1:BuEKDfySbSR4drPmRPG/7iBdf8hvFMuRexcpahXilzY=
4949
google.golang.org/protobuf v1.35.1 h1:m3LfL6/Ca+fqnjnlqQXNpFPABW1UD7mjh8KO2mKFytA=
5050
google.golang.org/protobuf v1.35.1/go.mod h1:9fA7Ob0pmnwhb644+1+CVWFRbNajQ6iRojtC/QF5bRE=
5151
gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=

0 commit comments

Comments
 (0)