docker-compose pip is garbage to install

Signed-off-by: Adam Hill <adam@diginc.us>
pi-hole · May 27, 2020 · 04ab6d4 · 04ab6d4
1 parent 92c1955
commit 04ab6d4
Show file tree

Hide file tree

Showing 4 changed files with 3 additions and 46 deletions.
diff --git a/Dockerfile_build b/Dockerfile_build
@@ -6,7 +6,8 @@ RUN apk --update add python3 python3-dev curl gcc make \
         musl-dev libffi-dev openssl-dev ${packages} \
     && rm -rf /var/cache/apk/* \
     && pip3 install -U pip pipenv
-
+RUN curl -L https://github.com/docker/compose/releases/download/1.25.5/docker-compose-`uname -s`-`uname -m` > /usr/local/bin/docker-compose && \
+    chmod +x /usr/local/bin/docker-compose 
 
 # -v "$(pwd):/$(pwd)" -w "$(pwd)" to prevent nested docker path confusion
 COPY ./Dockerfile.sh /usr/local/bin/

diff --git a/Pipfile b/Pipfile
@@ -58,7 +58,6 @@ Jinja2 = "==2.10.3"
 MarkupSafe = "==1.1.1"
 PyYAML = "==5.2"
 websocket_client = "==0.57.0"
-docker-compose = "*"
 
 [requires]
 python_version = "3.8"
diff --git a/Pipfile.lock b/Pipfile.lock
diff --git a/circle-test.sh b/circle-test.sh
@@ -2,10 +2,6 @@
 set -ex
 
 # Circle CI Job for single architecture
-if ! command -v docker-compose; then
-    curl -L https://github.com/docker/compose/releases/download/1.25.5/docker-compose-`uname -s`-`uname -m` > /usr/local/bin/docker-compose
-    chmod +x /usr/local/bin/docker-compose
-fi
 
 # setup qemu/variables
 docker run --rm --privileged multiarch/qemu-user-static:register --reset > /dev/null