From 4a974318e425444f765fed805fb32821d19faf3c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Alessandro=20Pezz=C3=A8?= Date: Fri, 24 Apr 2020 23:29:43 +0200 Subject: [PATCH 1/2] play: remove dockerd call --- updater/cmd.bash | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/updater/cmd.bash b/updater/cmd.bash index 4b3129b4a4..d9a31978f7 100644 --- a/updater/cmd.bash +++ b/updater/cmd.bash @@ -13,7 +13,7 @@ set -x export COMPOSE_INTERACTIVE_NO_CLI=1 -dockerd --host=unix:///var/run/docker.sock --host=tcp://0.0.0.0:2375 &> /dev/null & +# dockerd --host=unix:///var/run/docker.sock --host=tcp://0.0.0.0:2375 &> /dev/null & git clone --depth=1 "$REPO_POKEAPI" pokeapi git clone --depth=1 "$REPO_DATA" api-data From 790d79298014903f760f087035f7e386e638188d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Alessandro=20Pezz=C3=A8?= Date: Sat, 25 Apr 2020 12:32:01 +0200 Subject: [PATCH 2/2] refactor: pin Docker version --- updater/Dockerfile | 2 +- updater/cmd.bash | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/updater/Dockerfile b/updater/Dockerfile index 2a5a8973c1..9d987d8cfd 100644 --- a/updater/Dockerfile +++ b/updater/Dockerfile @@ -1,4 +1,4 @@ -FROM docker:dind +FROM docker:18.09.3-dind RUN apk update RUN apk add curl python3 git bash dos2unix openssh build-base python3-dev diff --git a/updater/cmd.bash b/updater/cmd.bash index d9a31978f7..4b3129b4a4 100644 --- a/updater/cmd.bash +++ b/updater/cmd.bash @@ -13,7 +13,7 @@ set -x export COMPOSE_INTERACTIVE_NO_CLI=1 -# dockerd --host=unix:///var/run/docker.sock --host=tcp://0.0.0.0:2375 &> /dev/null & +dockerd --host=unix:///var/run/docker.sock --host=tcp://0.0.0.0:2375 &> /dev/null & git clone --depth=1 "$REPO_POKEAPI" pokeapi git clone --depth=1 "$REPO_DATA" api-data