Docker のビルドが通らない問題( #71 )の暫定対処

shiguredo · Apr 30, 2019 · ad5b56b · ad5b56b
1 parent c5a108c
commit ad5b56b
Show file tree

Hide file tree

Showing 8 changed files with 8 additions and 8 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -1,4 +1,4 @@
-# syntax = docker/dockerfile:experimental
+# syntax = docker/dockerfile:1.0.0-experimental
 FROM ubuntu:16.04
 
 ARG PACKAGE_NAME