Use makedist to create a release from the master.
Some checks failed
continuous-integration/drone/push Build is failing

This commit is contained in:
2023-01-16 12:06:34 +01:00
parent 602eccbfae
commit 3c467d3a3b
2 changed files with 10 additions and 7 deletions

View File

@@ -4,8 +4,7 @@ FROM alpine:3.17.0
LABEL maintainer="Adrien Ferrand <ferrand.ad@gmail.com>"
#ARG BACKUPPC_VERSION="4.4.0"
ARG BACKUPPC_VERSION="master"
ARG BACKUPPC_VERSION="4.4.0"
ARG BACKUPPC_XS_VERSION="0.62"
ARG RSYNC_BPC_VERSION="3.1.3.0"
@@ -40,7 +39,13 @@ RUN apk --no-cache --update add \
&& sed -i -e 's/^# StrictHostKeyChecking ask/ StrictHostKeyChecking no/g' /etc/ssh/ssh_config \
# Get BackupPC, it will be installed at runtime to allow dynamic upgrade of existing config/pool
#&& curl -o /root/BackupPC-$BACKUPPC_VERSION.tar.gz -L https://github.com/backuppc/backuppc/releases/download/$BACKUPPC_VERSION/BackupPC-$BACKUPPC_VERSION.tar.gz \
&& curl -o /root/BackupPC-$BACKUPPC_VERSION.tar.gz -L https://github.com/backuppc/backuppc/archive/refs/heads/master.tar.gz \
&& curl -o /root/backuppc-master.tar.gz -L https://github.com/backuppc/backuppc/archive/refs/heads/master.tar.gz \
&& tar xvzf /root/backuppc-master.tar.gz
&& cd /root/backuppc-master
&& ./makeDist --version $BACKUPPC_VERSION
&& cp dist/BackupPC-$BACKUPPC_VERSION.tar.gz ../
&& cd ..
&& rm -rf backuppc-master
# Prepare backuppc home
&& mkdir -p /home/backuppc && cd /home/backuppc \
# Mark the docker as not run yet, to allow entrypoint to do its stuff

View File

@@ -41,8 +41,7 @@ if [ -f /firstrun ]; then
# Extract BackupPC
cd /root
tar xf "BackupPC-$BACKUPPC_VERSION.tar.gz"
#cd "/root/BackupPC-$BACKUPPC_VERSION"
cd "/root/backuppc-$BACKUPPC_VERSION"
cd "/root/BackupPC-$BACKUPPC_VERSION"
# Configure WEB UI access
configure_admin=""
@@ -121,8 +120,7 @@ if [ -f /firstrun ]; then
fi
# Clean
#rm -rf "/root/BackupPC-$BACKUPPC_VERSION.tar.gz" "/root/BackupPC-$BACKUPPC_VERSION" /firstrun
rm -rf "/root/BackupPC-$BACKUPPC_VERSION.tar.gz" "/root/backuppc-$BACKUPPC_VERSION" /firstrun
rm -rf "/root/BackupPC-$BACKUPPC_VERSION.tar.gz" "/root/BackupPC-$BACKUPPC_VERSION" /firstrun
fi
export BACKUPPC_UUID