2 files changed
+10
-2
No files matched your search
@@ -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", "--"]
|
||||
|
||||
@@ -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)
|
||||
Reference in new issue
Block a user