diff --git a/build/Makefile b/build/Makefile index afb68e95..c1132861 100644 --- a/build/Makefile +++ b/build/Makefile @@ -84,7 +84,7 @@ $(1).prepare: cp -r ../patch $(1)/patch cp -r ../script $(1)/script - DOCKER_BUILDKIT=1 docker build -t momo/$(1):m$$(WEBRTC_VERSION)-$$(WEBRTC_COMMIT_SHORT) $(DOCKER_BUILD_FLAGS) --build-arg WEBRTC_VERSION=$$(WEBRTC_VERSION) --build-arg WEBRTC_COMMIT=$$(WEBRTC_COMMIT) --build-arg BOOST_VERSION=$$(BOOST_VERSION) --build-arg PACKAGE_NAME=$(1) $(1) --progress plain + DOCKER_BUILDKIT=1 docker build -t momo/$(1):m$$(WEBRTC_VERSION)-$$(WEBRTC_COMMIT_SHORT) $(DOCKER_BUILD_FLAGS) --build-arg WEBRTC_VERSION=$$(WEBRTC_VERSION) --build-arg WEBRTC_COMMIT=$$(WEBRTC_COMMIT) --build-arg BOOST_VERSION=$$(BOOST_VERSION) --build-arg PACKAGE_NAME=$(1) $(1) rm -r $(1)/patch rm -r $(1)/script diff --git a/build/raspbian-stretch_armv6/Dockerfile b/build/raspbian-stretch_armv6/Dockerfile index 79ee5b43..73321f25 100644 --- a/build/raspbian-stretch_armv6/Dockerfile +++ b/build/raspbian-stretch_armv6/Dockerfile @@ -1,4 +1,4 @@ -# syntax = docker/dockerfile:experimental +# syntax = docker/dockerfile:1.0.0-experimental FROM ubuntu:16.04 ARG PACKAGE_NAME diff --git a/build/raspbian-stretch_armv7/Dockerfile b/build/raspbian-stretch_armv7/Dockerfile index d212e766..d93cefdd 100644 --- a/build/raspbian-stretch_armv7/Dockerfile +++ b/build/raspbian-stretch_armv7/Dockerfile @@ -1,4 +1,4 @@ -# syntax = docker/dockerfile:experimental +# syntax = docker/dockerfile:1.0.0-experimental FROM ubuntu:16.04 ARG PACKAGE_NAME diff --git a/build/ubuntu-16.04_armv7_ros/Dockerfile b/build/ubuntu-16.04_armv7_ros/Dockerfile index 68488a4f..0654b742 100644 --- a/build/ubuntu-16.04_armv7_ros/Dockerfile +++ b/build/ubuntu-16.04_armv7_ros/Dockerfile @@ -1,4 +1,4 @@ -# syntax = docker/dockerfile:experimental +# syntax = docker/dockerfile:1.0.0-experimental FROM ubuntu:16.04 ARG PACKAGE_NAME diff --git a/build/ubuntu-16.04_armv8/Dockerfile b/build/ubuntu-16.04_armv8/Dockerfile index 94098b07..4665ed36 100644 --- a/build/ubuntu-16.04_armv8/Dockerfile +++ b/build/ubuntu-16.04_armv8/Dockerfile @@ -1,4 +1,4 @@ -# syntax = docker/dockerfile:experimental +# syntax = docker/dockerfile:1.0.0-experimental FROM ubuntu:16.04 ARG PACKAGE_NAME diff --git a/build/ubuntu-16.04_x86_64_ros/Dockerfile b/build/ubuntu-16.04_x86_64_ros/Dockerfile index b6990629..8cd16d88 100644 --- a/build/ubuntu-16.04_x86_64_ros/Dockerfile +++ b/build/ubuntu-16.04_x86_64_ros/Dockerfile @@ -1,4 +1,4 @@ -# syntax = docker/dockerfile:experimental +# syntax = docker/dockerfile:1.0.0-experimental FROM ros:kinetic-ros-core-xenial ARG PACKAGE_NAME diff --git a/build/ubuntu-18.04_armv8/Dockerfile b/build/ubuntu-18.04_armv8/Dockerfile index 009e8bd8..6f45b51f 100644 --- a/build/ubuntu-18.04_armv8/Dockerfile +++ b/build/ubuntu-18.04_armv8/Dockerfile @@ -1,4 +1,4 @@ -# syntax = docker/dockerfile:experimental +# syntax = docker/dockerfile:1.0.0-experimental FROM ubuntu:18.04 ARG PACKAGE_NAME diff --git a/build/ubuntu-18.04_x86_64/Dockerfile b/build/ubuntu-18.04_x86_64/Dockerfile index faaaaeb5..37546d5c 100644 --- a/build/ubuntu-18.04_x86_64/Dockerfile +++ b/build/ubuntu-18.04_x86_64/Dockerfile @@ -1,4 +1,4 @@ -# syntax = docker/dockerfile:experimental +# syntax = docker/dockerfile:1.0.0-experimental FROM ubuntu:16.04 ARG PACKAGE_NAME