From 8a393cc0c32340abfbaf2c2693e38764ac41a0e3 Mon Sep 17 00:00:00 2001 From: Nicolas Carlier Date: Sun, 15 Mar 2020 23:07:38 +0000 Subject: [PATCH] feat(docker): use Docker Compose container wrapper --- Dockerfile | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/Dockerfile b/Dockerfile index ba71915..ca8344c 100644 --- a/Dockerfile +++ b/Dockerfile @@ -29,6 +29,9 @@ ARG REPOSITORY=github.com/ncarlier # Artifact name ARG ARTIFACT=webhookd +# Docker Compose version +ARG COMPOSE_VERSION=1.25.4 + # Fix lib dep RUN mkdir /lib64 && ln -s /lib/libc.musl-x86_64.so.1 /lib64/ld-linux-x86-64.so.2 @@ -36,11 +39,9 @@ RUN mkdir /lib64 && ln -s /lib/libc.musl-x86_64.so.1 /lib64/ld-linux-x86-64.so.2 RUN apk add --no-cache git openssh-client jq bash curl # Install docker-compose -RUN COMPOSE_VERSION="1.25.4" \ -&& apk add --no-cache \ - py-pip \ -&& pip install --no-cache-dir \ - docker-compose==${COMPOSE_VERSION} +RUN curl -L "https://github.com/docker/compose/releases/download/${COMPOSE_VERSION}/run.sh" \ + -o /usr/local/bin/docker-compose && \ + chmod +x /usr/local/bin/docker-compose # Create folder structure RUN mkdir -p /var/opt/webhookd/scripts /var/opt/webhookd/work