Removed BACKUP_TMP_DIR env variable and switched to mktemp -d instead of letting the user decide the temp dir path
This commit is contained in:
parent
06c319ef69
commit
d32c21f967
|
|
@ -5,7 +5,7 @@ set -eo pipefail
|
|||
[[ ! $# -eq 1 ]] && echo "Usage: $0 backup_number" && exit 1;
|
||||
[[ -z "${BACKUP_DIR}" ]] && echo "Required 'BACKUP_DIR' env not set" && exit 1;
|
||||
[[ -z "${JENKINS_HOME}" ]] && echo "Required 'JENKINS_HOME' env not set" && exit 1;
|
||||
BACKUP_TMP_DIR=${BACKUP_TMP_DIR:-/tmp}
|
||||
BACKUP_TMP_DIR=$(mktemp -d)
|
||||
|
||||
backup_number=$1
|
||||
echo "Running backup"
|
||||
|
|
|
|||
|
|
@ -15,13 +15,12 @@ fi
|
|||
|
||||
JENKINS_HOME="$(pwd)/jenkins_home"
|
||||
BACKUP_DIR="$(pwd)/backup"
|
||||
BACKUP_TMP_DIR="$(pwd)/tmp"
|
||||
RESTORE_FOLDER="$(pwd)/restore"
|
||||
mkdir -p ${BACKUP_DIR}
|
||||
mkdir -p ${RESTORE_FOLDER}
|
||||
|
||||
# Create an instance of the container under testing
|
||||
cid="$(docker run -e JENKINS_HOME=${JENKINS_HOME} -v ${JENKINS_HOME}:${JENKINS_HOME}:ro -e BACKUP_DIR=${BACKUP_DIR} -v ${BACKUP_DIR}:${BACKUP_DIR}:rw -e BACKUP_TMP_DIR=${BACKUP_TMP_DIR} -v ${BACKUP_TMP_DIR}:${BACKUP_TMP_DIR}:rw -e RESTORE_FOLDER=${RESTORE_FOLDER} -v ${RESTORE_FOLDER}:${RESTORE_FOLDER}:rw -d ${docker_image})"
|
||||
cid="$(docker run -e JENKINS_HOME=${JENKINS_HOME} -v ${JENKINS_HOME}:${JENKINS_HOME}:ro -e BACKUP_DIR=${BACKUP_DIR} -v ${BACKUP_DIR}:${BACKUP_DIR}:rw -e RESTORE_FOLDER=${RESTORE_FOLDER} -v ${RESTORE_FOLDER}:${RESTORE_FOLDER}:rw -d ${docker_image})"
|
||||
echo "Docker container ID '${cid}'"
|
||||
|
||||
# Remove test directory and container afterwards
|
||||
|
|
|
|||
|
|
@ -452,8 +452,6 @@ spec:
|
|||
env:
|
||||
- name: BACKUP_DIR
|
||||
value: /backup
|
||||
- name: BACKUP_TMP_DIR
|
||||
value: /tmp
|
||||
- name: JENKINS_HOME
|
||||
value: /jenkins-home
|
||||
- name: BACKUP_COUNT
|
||||
|
|
@ -465,8 +463,6 @@ spec:
|
|||
name: jenkins-home
|
||||
- mountPath: /backup # backup volume
|
||||
name: backup
|
||||
- mountPath: /tmp # backup tmp volume
|
||||
name: tmp
|
||||
volumes:
|
||||
- name: backup # PVC volume where backups will be stored
|
||||
persistentVolumeClaim:
|
||||
|
|
|
|||
|
|
@ -597,8 +597,6 @@ spec:
|
|||
env:
|
||||
- name: BACKUP_DIR
|
||||
value: /backup
|
||||
- name: BACKUP_TMP_DIR
|
||||
value: /tmp
|
||||
- name: JENKINS_HOME
|
||||
value: /jenkins-home
|
||||
- name: BACKUP_COUNT
|
||||
|
|
@ -610,8 +608,6 @@ spec:
|
|||
name: jenkins-home
|
||||
- mountPath: /backup # backup volume
|
||||
name: backup
|
||||
- mountPath: /tmp # backup tmp volume
|
||||
name: tmp
|
||||
volumes:
|
||||
- name: backup # PVC volume where backups will be stored
|
||||
persistentVolumeClaim:
|
||||
|
|
|
|||
Loading…
Reference in New Issue