Add possibility to build from BASE_IMAGE
parent
212b767925
commit
dcbcb99055
5
Makefile
5
Makefile
|
@ -1,6 +1,7 @@
|
||||||
BIN_IMAGE = blockbook-build
|
BIN_IMAGE = blockbook-build
|
||||||
DEB_IMAGE = blockbook-build-deb
|
DEB_IMAGE = blockbook-build-deb
|
||||||
PACKAGER = $(shell id -u):$(shell id -g)
|
PACKAGER = $(shell id -u):$(shell id -g)
|
||||||
|
BASE_IMAGE = $$(awk -F= '$$1=="ID" { print $$2 ;}' /etc/os-release):$$(awk -F= '$$1=="VERSION_ID" { print $$2 ;}' /etc/os-release | tr -d '"')
|
||||||
NO_CACHE = false
|
NO_CACHE = false
|
||||||
TCMALLOC =
|
TCMALLOC =
|
||||||
ARGS ?=
|
ARGS ?=
|
||||||
|
@ -44,8 +45,8 @@ build-images: clean-images
|
||||||
|
|
||||||
.bin-image:
|
.bin-image:
|
||||||
@if [ $$(build/tools/image_status.sh $(BIN_IMAGE):latest build/docker) != "ok" ]; then \
|
@if [ $$(build/tools/image_status.sh $(BIN_IMAGE):latest build/docker) != "ok" ]; then \
|
||||||
echo "Building image $(BIN_IMAGE)..."; \
|
echo "Building image $(BIN_IMAGE) from $(BASE_IMAGE)"; \
|
||||||
docker build --no-cache=$(NO_CACHE) --build-arg TCMALLOC=$(TCMALLOC) -t $(BIN_IMAGE) build/docker/bin; \
|
docker build --no-cache=$(NO_CACHE) --build-arg TCMALLOC=$(TCMALLOC) --build-arg BASE_IMAGE=$(BASE_IMAGE) -t $(BIN_IMAGE) build/docker/bin; \
|
||||||
else \
|
else \
|
||||||
echo "Image $(BIN_IMAGE) is up to date"; \
|
echo "Image $(BIN_IMAGE) is up to date"; \
|
||||||
fi
|
fi
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
# initialize from the image
|
# initialize from the image defined by BASE_IMAGE
|
||||||
|
ARG BASE_IMAGE
|
||||||
FROM debian:9
|
FROM $BASE_IMAGE
|
||||||
|
|
||||||
RUN apt-get update && \
|
RUN apt-get update && \
|
||||||
apt-get upgrade -y && \
|
apt-get upgrade -y && \
|
||||||
|
|
Loading…
Reference in New Issue