diff --git a/Dockerfile b/Dockerfile index b79f7a0..8b35415 100644 --- a/Dockerfile +++ b/Dockerfile @@ -6,6 +6,7 @@ RUN apk add --upgrade --no-cache restic bash python3 py3-pip RUN pip install click==8.1.7 docker==6.1.3 resticpy==1.0.2 COPY backupbot.py /usr/bin/backup +COPY entrypoint.sh /entrypoint.sh ENTRYPOINT /bin/bash CMD /entrypoint.sh diff --git a/abra.sh b/abra.sh index 03343f2..ce50a91 100644 --- a/abra.sh +++ b/abra.sh @@ -1,4 +1,3 @@ -export ENTRYPOINT_VERSION=v2 export BACKUPBOT_VERSION=v1 export SSH_CONFIG_VERSION=v1 diff --git a/compose.yml b/compose.yml index 34d1f51..5ba9e96 100644 --- a/compose.yml +++ b/compose.yml @@ -19,10 +19,6 @@ services: - coop-cloud.${STACK_NAME}.version=0.1.0+latest - coop-cloud.${STACK_NAME}.timeout=${TIMEOUT:-300} - coop-cloud.backupbot.enabled=true - configs: - - source: entrypoint - target: /entrypoint.sh - mode: 0555 #entrypoint: ['tail', '-f','/dev/null'] healthcheck: test: "pgrep crond" @@ -38,8 +34,3 @@ secrets: volumes: backups: - -configs: - entrypoint: - name: ${STACK_NAME}_entrypoint_${ENTRYPOINT_VERSION} - file: entrypoint.sh diff --git a/entrypoint.sh b/entrypoint.sh index 6af0132..5c25ed7 100644 --- a/entrypoint.sh +++ b/entrypoint.sh @@ -1,11 +1,6 @@ #!/bin/sh -set -e -o pipefail - -apk add --upgrade --no-cache restic bash python3 py3-pip py3-click py3-docker-py py3-json-logger curl - -# Todo use requirements file with specific versions -pip install --break-system-packages resticpy==1.0.2 +set -e if [ -n "$SSH_HOST_KEY" ] then