Docker updates

diff --git a/scripts/docker/docker.mk b/scripts/docker/docker.mk
index 72eeaecbf534f9ddf8c263576b16126d76ee94ed..7cf56ce32978e9555f962b45c7c6e88c6be7db02 100644 (file)
--- a/scripts/docker/docker.mk
+++ b/scripts/docker/docker.mk
@@ -50,12 +50,19 @@ ifneq "$(DOCKER_REGISTRY)" ""
 endif
 
 
-.PHONY: docker
-docker:
-       @echo Building $(DOCKER_COMMIT)
-       $(Q)docker build $(DOCKER_BUILD_ARGS) scripts/docker/ubuntu18 --build-arg=release=$(DOCKER_COMMIT) -t $(DOCKER_REGISTRY)$(DOCKER_REPO)$(DOCKER_TAG):$(DOCKER_VERSION)
+.PHONY: docker-ubuntu
+docker-ubuntu:
+       @echo Building ubuntu $(DOCKER_COMMIT)
+       $(Q)docker build $(DOCKER_BUILD_ARGS) scripts/docker/ubuntu20 --build-arg=release=$(DOCKER_COMMIT) -t $(DOCKER_REGISTRY)$(DOCKER_REPO)$(DOCKER_TAG):$(DOCKER_VERSION)
+
+.PHONY: docker-alpine
+docker-alpine:
+       @echo Building alpine $(DOCKER_COMMIT)
        $(Q)docker build $(DOCKER_BUILD_ARGS) scripts/docker/alpine --build-arg=release=$(DOCKER_COMMIT) -t $(DOCKER_REGISTRY)$(DOCKER_REPO)$(DOCKER_TAG):$(DOCKER_VERSION)-alpine
 
+.PHONY: docker
+docker: docker-ubuntu docker-alpine
+
 .PHONY: docker-push
 docker-push: docker
        $(Q)docker push $(DOCKER_REGISTRY)$(DOCKER_REPO)$(DOCKER_TAG):$(DOCKER_VERSION)

diff --git a/scripts/docker/ubuntu20/Dockerfile b/scripts/docker/ubuntu20/Dockerfile
index 16fb8162bdfa6497ddbbbb5d420e6f865a8b2ef9..5d6f33de5b5cf093f6a66372e9ef35c0660dfca8 100644 (file)
--- a/scripts/docker/ubuntu20/Dockerfile
+++ b/scripts/docker/ubuntu20/Dockerfile
@@ -44,6 +44,8 @@ RUN make -j2 deb
 FROM ${from}
 COPY --from=build /usr/local/src/repositories/*.deb /tmp/
 
+ARG DEBIAN_FRONTEND=noninteractive
+
 RUN apt-get update \
     && apt-get install -y /tmp/*.deb \
     && apt-get clean \