Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
26 commits
Select commit Hold shift + click to select a range
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 3 additions & 9 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,7 @@ RUN apt-get install -y git ca-certificates

COPY go.* ./

RUN --mount=type=cache,target=/go/pkg/ \
--mount=type=cache,target=/root/.cache/ \
go mod download
RUN go mod download

FROM builder-deps AS builder-web

Expand All @@ -25,9 +23,7 @@ ENV LDFLAGS="-s -w"

ENV GOOS=${TARGETOS} GOARCH=${TARGETARCH}

RUN --mount=type=cache,target=/go/pkg/ \
--mount=type=cache,target=/root/.cache/ \
go build -ldflags "$LDFLAGS" -o /go/bin/${APP}-web ./cmd/${APP}/web
RUN go build -ldflags "$LDFLAGS" -o /go/bin/${APP}-web ./cmd/${APP}/web

FROM builder-deps AS builder-ssh

Expand All @@ -42,9 +38,7 @@ ENV LDFLAGS="-s -w"

ENV GOOS=${TARGETOS} GOARCH=${TARGETARCH}

RUN --mount=type=cache,target=/go/pkg/ \
--mount=type=cache,target=/root/.cache/ \
go build -ldflags "$LDFLAGS" -o /go/bin/${APP}-ssh ./cmd/${APP}/ssh
RUN go build -ldflags "$LDFLAGS" -o /go/bin/${APP}-ssh ./cmd/${APP}/ssh

FROM scratch AS release-web

Expand Down
8 changes: 2 additions & 6 deletions Dockerfile.cdn
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,7 @@ RUN apt-get install -y git ca-certificates

COPY go.* ./

RUN --mount=type=cache,target=/go/pkg/,rw \
--mount=type=cache,target=/root/.cache/,rw \
go mod download
RUN go mod download

FROM builder-deps AS builder-web

Expand All @@ -24,9 +22,7 @@ ENV LDFLAGS="-s -w"

ENV GOOS=${TARGETOS} GOARCH=${TARGETARCH}

RUN --mount=type=cache,target=/go/pkg/,rw \
--mount=type=cache,target=/root/.cache/,rw \
go build -ldflags "$LDFLAGS" -o /go/bin/pgs-cdn ./cmd/pgs/cdn
RUN go build -ldflags "$LDFLAGS" -o /go/bin/pgs-cdn ./cmd/pgs/cdn

FROM scratch AS release-web

Expand Down
8 changes: 2 additions & 6 deletions Dockerfile.standalone
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,7 @@ RUN apt-get install -y git ca-certificates

COPY go.* ./

RUN --mount=type=cache,target=/go/pkg/,rw \
--mount=type=cache,target=/root/.cache/,rw \
go mod download
RUN go mod download

FROM builder-deps AS builder

Expand All @@ -24,9 +22,7 @@ ENV LDFLAGS="-s -w"

ENV GOOS=${TARGETOS} GOARCH=${TARGETARCH}

RUN --mount=type=cache,target=/go/pkg/,rw \
--mount=type=cache,target=/root/.cache/,rw \
go build -ldflags "$LDFLAGS" -o /go/bin/pgs ./cmd/pgs/standalone
RUN go build -ldflags "$LDFLAGS" -o /go/bin/pgs ./cmd/pgs/standalone

FROM scratch AS release

Expand Down
13 changes: 13 additions & 0 deletions Dockerfile.test
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
FROM golang:1.25.0-alpine

RUN apk add rsync openssh make gcc musl-dev

WORKDIR /app

COPY go.mod go.sum Makefile /app

RUN go mod download

ENV PICO_SECRET="danger"

CMD ["go", "test", "-race", "./..."]
12 changes: 3 additions & 9 deletions bouncer/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,7 @@ RUN git checkout v0.10.1

# RUN git apply ../subscriber-change.diff

RUN --mount=type=cache,target=/go/pkg/,rw \
--mount=type=cache,target=/root/.cache/,rw \
go mod download
RUN go mod download

FROM builder-deps AS builder

Expand All @@ -34,13 +32,9 @@ ENV LDFLAGS="-s -w"

ENV GOOS=${TARGETOS} GOARCH=${TARGETARCH}

RUN --mount=type=cache,target=/go/pkg/,rw \
--mount=type=cache,target=/root/.cache/,rw \
go build -ldflags "$LDFLAGS" ./cmd/soju
RUN go build -ldflags "$LDFLAGS" ./cmd/soju

RUN --mount=type=cache,target=/go/pkg/,rw \
--mount=type=cache,target=/root/.cache/,rw \
go build -ldflags "$LDFLAGS" ./cmd/sojuctl
RUN go build -ldflags "$LDFLAGS" ./cmd/sojuctl

FROM scratch

Expand Down
4 changes: 2 additions & 2 deletions caddy/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM --platform=$BUILDPLATFORM caddy:builder-alpine AS builder
FROM --platform=$BUILDPLATFORM docker.io/caddy:builder-alpine AS builder

ENV CGO_ENABLED=0

Expand All @@ -10,6 +10,6 @@ ENV GOOS=${TARGETOS} GOARCH=${TARGETARCH}
RUN xcaddy build \
--with github.com/caddy-dns/cloudflare

FROM caddy:alpine
FROM docker.io/caddy:alpine

COPY --from=builder /usr/bin/caddy /usr/bin/caddy
Loading