From ded4d9bdf7d805a5f12c58120821a1f757258b08 Mon Sep 17 00:00:00 2001 From: mc1 Date: Mon, 16 Nov 2020 12:05:39 +0100 Subject: [PATCH] fix: install pip3 --- src/Dockerfile | 44 +++----------------------------------------- 1 file changed, 3 insertions(+), 41 deletions(-) diff --git a/src/Dockerfile b/src/Dockerfile index 654a2c6..140eabd 100644 --- a/src/Dockerfile +++ b/src/Dockerfile @@ -11,38 +11,14 @@ ADD https://github.com/itzg/rcon-cli/releases/download/${RCON_CLI_VERSION}/rcon- RUN tar x -f /tmp/rcon-cli.tar.gz -C /opt/ && \ chmod +x /opt/rcon-cli -ARG RESTIC_VERSION=0.9.5 -ADD https://github.com/restic/restic/releases/download/v${RESTIC_VERSION}/restic_${RESTIC_VERSION}_linux_${IMAGE_ARCH}.bz2 /tmp/restic.bz2 - -RUN bunzip2 /tmp/restic.bz2 && \ - mv /tmp/restic /opt/restic && \ - chmod +x /opt/restic - -ARG DEMOTER_VERSION=0.1.0 - -ADD https://github.com/itzg/entrypoint-demoter/releases/download/${DEMOTER_VERSION}/entrypoint-demoter_${DEMOTER_VERSION}_linux_${IMAGE_ARCH}.tar.gz /tmp/entrypoint-demoter.tar.gz - -RUN tar x -f /tmp/entrypoint-demoter.tar.gz -C /opt/ && \ - chmod +x /opt/entrypoint-demoter - -ARG RCLONE_VERSION=1.49.5 - -ADD https://downloads.rclone.org/v${RCLONE_VERSION}/rclone-v${RCLONE_VERSION}-linux-${IMAGE_ARCH}.zip /tmp/rclone.zip - -RUN mkdir -p /tmp/rclone && \ - unzip /tmp/rclone.zip -d /tmp/rclone && \ - mv /tmp/rclone/rclone-v${RCLONE_VERSION}-linux-${IMAGE_ARCH}/rclone /opt/rclone && \ - chmod +x /opt/rclone - - -FROM alpine +FROM restic/restic RUN apk -U --no-cache add \ bash \ coreutils \ openssh-client \ - python3 \ + python3 py3-pip \ dcron \ mariadb-client \ postgresql-client @@ -51,20 +27,6 @@ COPY --from=builder /opt/rcon-cli /opt/rcon-cli RUN ln -s /opt/rcon-cli /usr/bin -COPY --from=builder /opt/restic /opt/restic - -RUN ln -s /opt/restic /usr/bin - - -COPY --from=builder /opt/entrypoint-demoter /opt/entrypoint-demoter - -RUN ln -s /opt/entrypoint-demoter /usr/bin - - -COPY --from=builder /opt/rclone /opt/rclone - -RUN ln -s /opt/rclone /usr/bin - # install rcb python app ADD . /restic-compose-backup @@ -79,4 +41,4 @@ ADD backup.sh /backup.sh RUN chmod +x ./backup.sh ENTRYPOINT [] -CMD ["./entrypoint.sh"] \ No newline at end of file +CMD ["./entrypoint.sh"]