From ba6e78900ce2f0da1ffe8710ef6533c86c0cbe7d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gr=C3=A9goire=20Henry?= Date: Tue, 22 Aug 2017 14:09:21 +0200 Subject: [PATCH] Makefile: fix compat issue with macOS. --- scripts/create_docker_image.build.sh | 4 ++-- scripts/create_docker_image.build_deps.sh | 6 +++--- scripts/create_docker_image.minimal.sh | 4 ++-- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/scripts/create_docker_image.build.sh b/scripts/create_docker_image.build.sh index 513613837..8920de8ce 100755 --- a/scripts/create_docker_image.build.sh +++ b/scripts/create_docker_image.build.sh @@ -18,8 +18,8 @@ cleanup () { } trap cleanup EXIT INT -sed scripts/Dockerfile.build.in \ - -e 's|$base_image|'"$build_deps_image_name"'|g' > Dockerfile +sed -e 's|$base_image|'"$build_deps_image_name"'|g' \ + scripts/Dockerfile.build.in > Dockerfile echo echo "### Building tezos..." diff --git a/scripts/create_docker_image.build_deps.sh b/scripts/create_docker_image.build_deps.sh index 9ee604bb7..87d07c1f6 100755 --- a/scripts/create_docker_image.build_deps.sh +++ b/scripts/create_docker_image.build_deps.sh @@ -23,9 +23,9 @@ cleanup () { } trap cleanup EXIT INT -sed scripts/Dockerfile.build_deps.in \ - -e 's|$base_image|'"$base_image"'|g' \ - -e 's|$ocaml_version|'"$ocaml_version"'|g' > Dockerfile +sed -e 's|$base_image|'"$base_image"'|g' \ + -e 's|$ocaml_version|'"$ocaml_version"'|g' \ + scripts/Dockerfile.build_deps.in > Dockerfile ## Lookup for for prebuilt dependencies... dependencies="scripts/install_build_deps.sh src/tezos-deps.opam Dockerfile" diff --git a/scripts/create_docker_image.minimal.sh b/scripts/create_docker_image.minimal.sh index 6e3f92e99..a19d135e2 100755 --- a/scripts/create_docker_image.minimal.sh +++ b/scripts/create_docker_image.minimal.sh @@ -30,8 +30,8 @@ echo echo "### Building minimal docker image..." echo -sed scripts/Dockerfile.minimal.in \ - -e 's|$alpine_version|'"$alpine_version"'|g' > Dockerfile +sed -e 's|$alpine_version|'"$alpine_version"'|g' \ + scripts/Dockerfile.minimal.in > Dockerfile docker build -t "$image_name:$image_version" . echo