Skip to content

Commit a9430a4

Browse files
authored
support user build-arg (#428)
* support user build-arg * simplify * set default user
1 parent f33b020 commit a9430a4

File tree

3 files changed

+20
-8
lines changed

3 files changed

+20
-8
lines changed

Dockerfile

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,17 @@
11
FROM alpine:3.18.2
22

33
ARG TARGETDIR
4+
ARG USERNAME
45

5-
RUN addgroup -S -g 65532 ng-user && \
6+
RUN if [ "$USERNAME" = "ng-user" ]; then \
7+
addgroup -S -g 65532 ng-user && \
68
adduser -S -D -H -u 65532 \
7-
-s /sbin/nologin -G ng-user -g ng-user ng-user
9+
-s /sbin/nologin -G ng-user -g ng-user ng-user; \
10+
fi
811

912
ADD bin/${TARGETDIR}/controller-manager /usr/local/bin/controller-manager
10-
ADD bin/${BUILDPLATFORM}/autoscaler /usr/local/bin/autoscaler
13+
ADD bin/${TARGETDIR}/autoscaler /usr/local/bin/autoscaler
1114
ADD bin/${TARGETDIR}/scheduler /usr/local/bin/scheduler
12-
USER 65532:65532
15+
16+
# [Optional] Set the default user. Omit if you want to keep the default as root.
17+
USER $USERNAME

Dockerfile.multiarch

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,17 @@
11
FROM alpine:3.18.2
22

33
ARG TARGETPLATFORM
4+
ARG USERNAME
45

5-
RUN addgroup -S -g 65532 ng-user && \
6+
RUN if [ "$USERNAME" = "ng-user" ]; then \
7+
addgroup -S -g 65532 ng-user && \
68
adduser -S -D -H -u 65532 \
7-
-s /sbin/nologin -G ng-user -g ng-user ng-user
9+
-s /sbin/nologin -G ng-user -g ng-user ng-user; \
10+
fi
811

912
ADD bin/${TARGETPLATFORM}/controller-manager /usr/local/bin/controller-manager
1013
ADD bin/${TARGETPLATFORM}/autoscaler /usr/local/bin/autoscaler
1114
ADD bin/${TARGETPLATFORM}/scheduler /usr/local/bin/scheduler
12-
USER 65532:65532
15+
16+
# [Optional] Set the default user. Omit if you want to keep the default as root.
17+
USER $USERNAME

Makefile

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,8 @@ LDFLAGS = $(if $(DEBUGGER),,-s -w) $(shell ./hack/version.sh)
55

66
DOCKER_REGISTRY ?= docker.io
77
DOCKER_REPO ?= ${DOCKER_REGISTRY}/vesoft
8-
IMAGE_TAG ?= v1.7.0
8+
USERNAME ?= ng-user
9+
IMAGE_TAG ?= v1.7.5
910

1011
CHARTS_VERSION ?= 1.7.0
1112

@@ -104,6 +105,7 @@ docker-multiarch: ensure-buildx ## Build and push the nebula-operator multiarchi
104105
--progress plain \
105106
--platform $(BUILDX_PLATFORMS) \
106107
--file Dockerfile.multiarch \
108+
--build-arg USERNAME=${USERNAME} \
107109
-t "${DOCKER_REPO}/nebula-operator:${IMAGE_TAG}" .
108110

109111
alpine-tools: ## Build and push the alpine-tools docker images and manifest.

0 commit comments

Comments
 (0)