From 8dc4d569def3b869ba39ca68074bc85c155fef54 Mon Sep 17 00:00:00 2001 From: Ghe Rivero Date: Sat, 14 Jan 2017 00:59:24 +0100 Subject: [PATCH] Fixed sidecar running group for arm arch The base image used to build the containers for the arm arch (both arm and arm64) uses the pair nobody:nogroup while amd64 arch uses nobody:nobody --- Dockerfile.sidecar | 2 +- Dockerfile.sidecar-e2e | 2 +- rules.mk | 5 +++++ 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/Dockerfile.sidecar b/Dockerfile.sidecar index a3273de9d..69f1f3172 100644 --- a/Dockerfile.sidecar +++ b/Dockerfile.sidecar @@ -18,5 +18,5 @@ MAINTAINER Bowei Du ADD bin/ARG_ARCH/ARG_BIN /ARG_BIN -USER nobody:nobody +USER nobody:ARG_NOBODY ENTRYPOINT ["/ARG_BIN"] diff --git a/Dockerfile.sidecar-e2e b/Dockerfile.sidecar-e2e index a3273de9d..69f1f3172 100644 --- a/Dockerfile.sidecar-e2e +++ b/Dockerfile.sidecar-e2e @@ -18,5 +18,5 @@ MAINTAINER Bowei Du ADD bin/ARG_ARCH/ARG_BIN /ARG_BIN -USER nobody:nobody +USER nobody:ARG_NOBODY ENTRYPOINT ["/ARG_BIN"] diff --git a/rules.mk b/rules.mk index 067c6e67f..d78b3430e 100644 --- a/rules.mk +++ b/rules.mk @@ -31,15 +31,19 @@ ALL_ARCH := amd64 arm arm64 ppc64le # Set default base image dynamically for each arch ifeq ($(ARCH),amd64) BASEIMAGE?=alpine + NOBODY?=nobody endif ifeq ($(ARCH),arm) BASEIMAGE?=armel/busybox + NOBODY?=nogroup endif ifeq ($(ARCH),arm64) BASEIMAGE?=aarch64/busybox + NOBODY?=nogroup endif ifeq ($(ARCH),ppc64le) BASEIMAGE?=ppc64le/busybox + NOBODY?=nobody endif # These rules MUST be expanded at reference time (hence '=') as BINARY @@ -114,6 +118,7 @@ define DOCKERFILE_RULE -e 's|ARG_BIN|$(BINARY)|g' \ -e 's|ARG_ARCH|$(ARCH)|g' \ -e 's|ARG_FROM|$(BASEIMAGE)|g' \ + -e 's|ARG_NOBODY|$(NOBODY)|g' \ $$< > $$@ .$(BUILDSTAMP_NAME)-container: .$(BINARY)-$(ARCH)-dockerfile endef