balsoft/ligo
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Makefile: fix compat issue with macOS.

Browse Source
This commit is contained in:
Grégoire Henry 2017-08-22 14:09:21 +02:00
parent 90f9ab4200
commit ba6e78900c
3 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
scripts/create_docker_image.build.sh
View File

@ -18,8 +18,8 @@ cleanup () {
} }
trap cleanup EXIT INT trap cleanup EXIT INT
sed scripts/Dockerfile.build.in \ sed -e 's|$base_image|'"$build_deps_image_name"'|g' \
-e 's|$base_image|'"$build_deps_image_name"'|g' > Dockerfile scripts/Dockerfile.build.in > Dockerfile
echo echo
echo "### Building tezos..." echo "### Building tezos..."

6
scripts/create_docker_image.build_deps.sh
View File

@ -23,9 +23,9 @@ cleanup () {
} }
trap cleanup EXIT INT trap cleanup EXIT INT
sed scripts/Dockerfile.build_deps.in \ sed -e 's|$base_image|'"$base_image"'|g' \
-e 's|$base_image|'"$base_image"'|g' \ -e 's|$ocaml_version|'"$ocaml_version"'|g' \
-e 's|$ocaml_version|'"$ocaml_version"'|g' > Dockerfile scripts/Dockerfile.build_deps.in > Dockerfile
## Lookup for for prebuilt dependencies... ## Lookup for for prebuilt dependencies...
dependencies="scripts/install_build_deps.sh src/tezos-deps.opam Dockerfile" dependencies="scripts/install_build_deps.sh src/tezos-deps.opam Dockerfile"

4
scripts/create_docker_image.minimal.sh
View File

@ -30,8 +30,8 @@ echo
echo "### Building minimal docker image..." echo "### Building minimal docker image..."
echo echo
sed scripts/Dockerfile.minimal.in \ sed -e 's|$alpine_version|'"$alpine_version"'|g' \
-e 's|$alpine_version|'"$alpine_version"'|g' > Dockerfile scripts/Dockerfile.minimal.in > Dockerfile
docker build -t "$image_name:$image_version" . docker build -t "$image_name:$image_version" .
echo echo