From c5910366829c5fa3041600dc2aecd314bef43675 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9bastien=20Han?= Date: Thu, 21 Dec 2017 15:40:07 +0100 Subject: [PATCH] images: bump tiny's version MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit We now use the latest version of Tini. Also the version is now configurable. Signed-off-by: Sébastien Han --- images/base/Dockerfile | 3 ++- images/base/Makefile | 9 ++++++++- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/images/base/Dockerfile b/images/base/Dockerfile index 2db794b0b..d96498809 100644 --- a/images/base/Dockerfile +++ b/images/base/Dockerfile @@ -25,9 +25,10 @@ RUN HOST_IP=$(route -n | awk '/^0.0.0.0/ {print $2}') && \ echo 'Acquire::http::ProxyAutoDetect "/usr/local/bin/apt-ng-host-discover";' > /etc/apt/apt.conf.d/30proxy ARG ARCH +ARG TINI_VERSION # Run tini as PID 1 and avoid signal handling issues -ADD https://github.com/krallin/tini/releases/download/v0.14.0/tini-${ARCH} /tini +ADD https://github.com/krallin/tini/releases/download/${TINI_VERSION}/tini-${ARCH} /tini RUN chmod +x /tini ENTRYPOINT ["/tini", "-g", "--"] diff --git a/images/base/Makefile b/images/base/Makefile index cf600a114..a4637b685 100755 --- a/images/base/Makefile +++ b/images/base/Makefile @@ -17,6 +17,9 @@ include ../image.mk # the final base image IMAGE = $(BUILD_REGISTRY)/base-$(GOARCH) +# tini's version +TINI_VERSION = v0.16.1 + # the full OS image from which we generate a smaller rootfs ROOTFS_BUILDER_IMAGE := $(BUILD_REGISTRY)/rootfs-builder-$(GOARCH) @@ -51,5 +54,9 @@ do.build: rootfs-build @echo === docker build $(IMAGE) @cp Dockerfile $(TEMP) @cd $(TEMP) && $(SED_CMD) "s|BASEIMAGE|$(ROOTFS_IMAGE)|g" Dockerfile - @docker build $(BUILD_ARGS) --build-arg ARCH=$(DEBIAN_ARCH) -t $(IMAGE) $(TEMP) + @docker build $(BUILD_ARGS) \ + --build-arg ARCH=$(DEBIAN_ARCH) \ + --build-arg TINI_VERSION=$(TINI_VERSION) \ + -t $(IMAGE) \ + $(TEMP) @rm -fr $(TEMP)