mirror of
https://github.com/netbirdio/netbird.git
synced 2026-09-26 00:29:06 +02:00
- Replace Alpine base image with Distroless base:debug across Dockerfiles
- Add ARM7 (goarm:7) support in GoReleaser configuration - Simplify ARM platform references in .goreleaser.yaml
This commit is contained in:
+18
-6
@@ -90,6 +90,8 @@ builds:
|
|||||||
- amd64
|
- amd64
|
||||||
- arm64
|
- arm64
|
||||||
- arm
|
- arm
|
||||||
|
goarm:
|
||||||
|
- 7
|
||||||
ldflags:
|
ldflags:
|
||||||
- -s -w -X github.com/netbirdio/netbird/version.version={{.Version}} -X main.commit={{.Commit}} -X main.date={{.CommitDate}} -X main.builtBy=goreleaser
|
- -s -w -X github.com/netbirdio/netbird/version.version={{.Version}} -X main.commit={{.Commit}} -X main.date={{.CommitDate}} -X main.builtBy=goreleaser
|
||||||
mod_timestamp: "{{ .CommitTimestamp }}"
|
mod_timestamp: "{{ .CommitTimestamp }}"
|
||||||
@@ -104,6 +106,8 @@ builds:
|
|||||||
- amd64
|
- amd64
|
||||||
- arm64
|
- arm64
|
||||||
- arm
|
- arm
|
||||||
|
goarm:
|
||||||
|
- 7
|
||||||
ldflags:
|
ldflags:
|
||||||
- -s -w -X github.com/netbirdio/netbird/version.version={{.Version}} -X main.commit={{.Commit}} -X main.date={{.CommitDate}} -X main.builtBy=goreleaser
|
- -s -w -X github.com/netbirdio/netbird/version.version={{.Version}} -X main.commit={{.Commit}} -X main.date={{.CommitDate}} -X main.builtBy=goreleaser
|
||||||
mod_timestamp: "{{ .CommitTimestamp }}"
|
mod_timestamp: "{{ .CommitTimestamp }}"
|
||||||
@@ -124,6 +128,8 @@ builds:
|
|||||||
- amd64
|
- amd64
|
||||||
- arm64
|
- arm64
|
||||||
- arm
|
- arm
|
||||||
|
goarm:
|
||||||
|
- 7
|
||||||
ldflags:
|
ldflags:
|
||||||
- -s -w -X github.com/netbirdio/netbird/version.version={{.Version}} -X main.commit={{.Commit}} -X main.date={{.CommitDate}} -X main.builtBy=goreleaser
|
- -s -w -X github.com/netbirdio/netbird/version.version={{.Version}} -X main.commit={{.Commit}} -X main.date={{.CommitDate}} -X main.builtBy=goreleaser
|
||||||
mod_timestamp: "{{ .CommitTimestamp }}"
|
mod_timestamp: "{{ .CommitTimestamp }}"
|
||||||
@@ -138,6 +144,8 @@ builds:
|
|||||||
- amd64
|
- amd64
|
||||||
- arm64
|
- arm64
|
||||||
- arm
|
- arm
|
||||||
|
goarm:
|
||||||
|
- 7
|
||||||
ldflags:
|
ldflags:
|
||||||
- -s -w -X github.com/netbirdio/netbird/version.version={{.Version}} -X main.commit={{.Commit}} -X main.date={{.CommitDate}} -X main.builtBy=goreleaser
|
- -s -w -X github.com/netbirdio/netbird/version.version={{.Version}} -X main.commit={{.Commit}} -X main.date={{.CommitDate}} -X main.builtBy=goreleaser
|
||||||
mod_timestamp: "{{ .CommitTimestamp }}"
|
mod_timestamp: "{{ .CommitTimestamp }}"
|
||||||
@@ -152,6 +160,8 @@ builds:
|
|||||||
- amd64
|
- amd64
|
||||||
- arm64
|
- arm64
|
||||||
- arm
|
- arm
|
||||||
|
goarm:
|
||||||
|
- 7
|
||||||
ldflags:
|
ldflags:
|
||||||
- -s -w -X main.Version={{.Version}} -X main.Commit={{.Commit}} -X main.BuildDate={{.CommitDate}}
|
- -s -w -X main.Version={{.Version}} -X main.Commit={{.Commit}} -X main.BuildDate={{.CommitDate}}
|
||||||
mod_timestamp: "{{ .CommitTimestamp }}"
|
mod_timestamp: "{{ .CommitTimestamp }}"
|
||||||
@@ -172,6 +182,8 @@ builds:
|
|||||||
- amd64
|
- amd64
|
||||||
- arm64
|
- arm64
|
||||||
- arm
|
- arm
|
||||||
|
goarm:
|
||||||
|
- 7
|
||||||
ldflags:
|
ldflags:
|
||||||
- -s -w -X github.com/netbirdio/netbird/version.version={{.Version}} -X main.commit={{.Commit}} -X main.date={{.CommitDate}} -X main.builtBy=goreleaser
|
- -s -w -X github.com/netbirdio/netbird/version.version={{.Version}} -X main.commit={{.Commit}} -X main.date={{.CommitDate}} -X main.builtBy=goreleaser
|
||||||
mod_timestamp: "{{ .CommitTimestamp }}"
|
mod_timestamp: "{{ .CommitTimestamp }}"
|
||||||
@@ -287,7 +299,7 @@ dockers_v2:
|
|||||||
platforms:
|
platforms:
|
||||||
- linux/amd64
|
- linux/amd64
|
||||||
- linux/arm64
|
- linux/arm64
|
||||||
- linux/arm/6
|
- linux/arm
|
||||||
annotations:
|
annotations:
|
||||||
"org.opencontainers.image.created": "{{.Date}}"
|
"org.opencontainers.image.created": "{{.Date}}"
|
||||||
"org.opencontainers.image.title": "{{.ProjectName}}"
|
"org.opencontainers.image.title": "{{.ProjectName}}"
|
||||||
@@ -309,7 +321,7 @@ dockers_v2:
|
|||||||
platforms:
|
platforms:
|
||||||
- linux/amd64
|
- linux/amd64
|
||||||
- linux/arm64
|
- linux/arm64
|
||||||
- linux/arm/6
|
- linux/arm
|
||||||
annotations:
|
annotations:
|
||||||
"org.opencontainers.image.created": "{{.Date}}"
|
"org.opencontainers.image.created": "{{.Date}}"
|
||||||
"org.opencontainers.image.title": "{{.ProjectName}}"
|
"org.opencontainers.image.title": "{{.ProjectName}}"
|
||||||
@@ -331,7 +343,7 @@ dockers_v2:
|
|||||||
platforms:
|
platforms:
|
||||||
- linux/amd64
|
- linux/amd64
|
||||||
- linux/arm64
|
- linux/arm64
|
||||||
- linux/arm/6
|
- linux/arm
|
||||||
annotations:
|
annotations:
|
||||||
"org.opencontainers.image.created": "{{.Date}}"
|
"org.opencontainers.image.created": "{{.Date}}"
|
||||||
"org.opencontainers.image.title": "{{.ProjectName}}"
|
"org.opencontainers.image.title": "{{.ProjectName}}"
|
||||||
@@ -353,7 +365,7 @@ dockers_v2:
|
|||||||
platforms:
|
platforms:
|
||||||
- linux/amd64
|
- linux/amd64
|
||||||
- linux/arm64
|
- linux/arm64
|
||||||
- linux/arm/6
|
- linux/arm
|
||||||
annotations:
|
annotations:
|
||||||
"org.opencontainers.image.created": "{{.Date}}"
|
"org.opencontainers.image.created": "{{.Date}}"
|
||||||
"org.opencontainers.image.title": "{{.ProjectName}}"
|
"org.opencontainers.image.title": "{{.ProjectName}}"
|
||||||
@@ -375,7 +387,7 @@ dockers_v2:
|
|||||||
platforms:
|
platforms:
|
||||||
- linux/amd64
|
- linux/amd64
|
||||||
- linux/arm64
|
- linux/arm64
|
||||||
- linux/arm/6
|
- linux/arm
|
||||||
annotations:
|
annotations:
|
||||||
"org.opencontainers.image.created": "{{.Date}}"
|
"org.opencontainers.image.created": "{{.Date}}"
|
||||||
"org.opencontainers.image.title": "{{.ProjectName}}"
|
"org.opencontainers.image.title": "{{.ProjectName}}"
|
||||||
@@ -397,7 +409,7 @@ dockers_v2:
|
|||||||
platforms:
|
platforms:
|
||||||
- linux/amd64
|
- linux/amd64
|
||||||
- linux/arm64
|
- linux/arm64
|
||||||
- linux/arm/6
|
- linux/arm
|
||||||
annotations:
|
annotations:
|
||||||
"org.opencontainers.image.created": "{{.Date}}"
|
"org.opencontainers.image.created": "{{.Date}}"
|
||||||
"org.opencontainers.image.title": "{{.ProjectName}}"
|
"org.opencontainers.image.title": "{{.ProjectName}}"
|
||||||
|
|||||||
+1
-2
@@ -6,8 +6,7 @@ RUN echo "netbird:x:1000:1000:netbird:/var/lib/netbird:/sbin/nologin" > /tmp/pas
|
|||||||
mkdir -p /tmp/var/lib/netbird && \
|
mkdir -p /tmp/var/lib/netbird && \
|
||||||
mkdir -p /tmp/certs
|
mkdir -p /tmp/certs
|
||||||
|
|
||||||
FROM alpine:3.24
|
FROM gcr.io/distroless/base:debug
|
||||||
RUN apk add --no-cache bash ca-certificates
|
|
||||||
ARG TARGETPLATFORM
|
ARG TARGETPLATFORM
|
||||||
COPY ${TARGETPLATFORM}/netbird-proxy /go/bin/netbird-proxy
|
COPY ${TARGETPLATFORM}/netbird-proxy /go/bin/netbird-proxy
|
||||||
COPY --from=builder /tmp/passwd /etc/passwd
|
COPY --from=builder /tmp/passwd /etc/passwd
|
||||||
|
|||||||
+1
-2
@@ -1,5 +1,4 @@
|
|||||||
FROM alpine:3.24
|
FROM gcr.io/distroless/base:debug
|
||||||
RUN apk add --no-cache bash ca-certificates
|
|
||||||
ENTRYPOINT [ "/go/bin/netbird-relay" ]
|
ENTRYPOINT [ "/go/bin/netbird-relay" ]
|
||||||
ENV NB_LOG_FILE=console
|
ENV NB_LOG_FILE=console
|
||||||
ARG TARGETPLATFORM
|
ARG TARGETPLATFORM
|
||||||
|
|||||||
+1
-2
@@ -1,5 +1,4 @@
|
|||||||
FROM alpine:3.24
|
FROM gcr.io/distroless/base:debug
|
||||||
RUN apk add --no-cache bash ca-certificates
|
|
||||||
ENTRYPOINT [ "/go/bin/netbird-signal","run" ]
|
ENTRYPOINT [ "/go/bin/netbird-signal","run" ]
|
||||||
CMD ["--log-file", "console"]
|
CMD ["--log-file", "console"]
|
||||||
ARG TARGETPLATFORM
|
ARG TARGETPLATFORM
|
||||||
|
|||||||
@@ -1,5 +1,4 @@
|
|||||||
FROM alpine:3.24
|
FROM gcr.io/distroless/base:debug
|
||||||
RUN apk add --no-cache bash ca-certificates
|
|
||||||
ENTRYPOINT [ "/go/bin/netbird-upload" ]
|
ENTRYPOINT [ "/go/bin/netbird-upload" ]
|
||||||
ARG TARGETPLATFORM
|
ARG TARGETPLATFORM
|
||||||
COPY ${TARGETPLATFORM}/netbird-upload /go/bin/netbird-upload
|
COPY ${TARGETPLATFORM}/netbird-upload /go/bin/netbird-upload
|
||||||
|
|||||||
Reference in New Issue
Block a user