Skip to content

Commit 7e58e52

Browse files
Use non root user in operator.Dockerfile (#759)
* Use non-root user in operator image * run make manager first
1 parent a13cddc commit 7e58e52

File tree

3 files changed

+17
-8
lines changed

3 files changed

+17
-8
lines changed

.ci/tests/integration-oauth2/e2e.yaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -90,10 +90,10 @@ setup:
9090
9191
- name: install function-mesh operator
9292
command: |
93-
make generate
93+
make manager
9494
make helm-crds
95-
image="function-mesh-operator:latest"
96-
IMG=${image} make docker-build-skip-test
95+
image="function-mesh:latest"
96+
docker build --platform linux/amd64 -f operator.Dockerfile -t $image .
9797
kind load docker-image ${image}
9898
helm install ${FUNCTION_MESH_RELEASE_NAME} -n ${FUNCTION_MESH_NAMESPACE} --set operatorImage=${image} --create-namespace charts/function-mesh-operator
9999
wait:

.ci/tests/integration-oauth2/e2e_with_downloader.yaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -90,10 +90,10 @@ setup:
9090
9191
- name: install function-mesh operator
9292
command: |
93-
make generate
93+
make manager
9494
make helm-crds
95-
image="function-mesh-operator:latest"
96-
IMG=${image} make docker-build-skip-test
95+
image="function-mesh:latest"
96+
docker build --platform linux/amd64 -f operator.Dockerfile -t $image .
9797
kind load docker-image ${image}
9898
helm install ${FUNCTION_MESH_RELEASE_NAME} -n ${FUNCTION_MESH_NAMESPACE} --set operatorImage=${image} --set controllerManager.enableInitContainers=true --create-namespace charts/function-mesh-operator
9999
wait:

operator.Dockerfile

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,14 @@
11
FROM alpine:3.20
22

3-
RUN apk add tzdata --no-cache
4-
RUN apk upgrade --no-cache
3+
ENV GID=10001
4+
ENV UID=10000
5+
ENV USER=pulsar
6+
7+
RUN apk upgrade --no-cache \
8+
&& apk add tzdata --no-cache \
9+
&& addgroup -g $GID pulsar \
10+
&& adduser -u $UID -G pulsar -D -g '' $USER
11+
512
ADD bin/function-mesh-controller-manager /manager
13+
14+
USER $USER

0 commit comments

Comments
 (0)