Merge branch 'master' of forge.o9.re:olivier/eost_gissmo_tools
This commit is contained in:
commit
1cf29b3e5b
@ -263,6 +263,9 @@ test_restore() {
|
|||||||
DUMP_FILE=`basename $ARGS`
|
DUMP_FILE=`basename $ARGS`
|
||||||
info "Dump file found: ${DUMP_FILE}"
|
info "Dump file found: ${DUMP_FILE}"
|
||||||
DUMP_DIR="${ARGS%/*}"
|
DUMP_DIR="${ARGS%/*}"
|
||||||
|
if [ -z "$DUMP_DIR" ]; then
|
||||||
|
DUMP_DIR="/"
|
||||||
|
fi
|
||||||
}
|
}
|
||||||
|
|
||||||
psql() {
|
psql() {
|
||||||
@ -279,7 +282,7 @@ restore() {
|
|||||||
test_restore
|
test_restore
|
||||||
$docker_cmd stop ${POSTGRES_DOCKER_NAME} && $docker_cmd rm ${POSTGRES_DOCKER_NAME} || error_and_quit "Failed to stop and delete postgreSQL Docker container: ${POSTGRES_DOCKER_NAME}"
|
$docker_cmd stop ${POSTGRES_DOCKER_NAME} && $docker_cmd rm ${POSTGRES_DOCKER_NAME} || error_and_quit "Failed to stop and delete postgreSQL Docker container: ${POSTGRES_DOCKER_NAME}"
|
||||||
sudo rm -rf ${DB_DIR} || error_and_quit "Failed to delete this directory: ${DB_DIR}"
|
sudo rm -rf ${DB_DIR} || error_and_quit "Failed to delete this directory: ${DB_DIR}"
|
||||||
$docker_cmd run -d -P -v "${DB_DIR}:/var/lib/postgresql/data" --name "${POSTGRES_DOCKER_NAME}" "postgres:${POSTGRES_VERSION}" || error_and_quit "Launching database docker container failed."
|
$docker_cmd run -d -p ${POSTGRES_PORT}:5432 -v "${DB_DIR}:/var/lib/postgresql/data" --name "${POSTGRES_DOCKER_NAME}" "postgres:${POSTGRES_VERSION}" || error_and_quit "Launching database docker container failed."
|
||||||
sleep 6 # to wait about docker container runs totally
|
sleep 6 # to wait about docker container runs totally
|
||||||
RESTORE_COMMAND="$docker_cmd run -it --rm --link ${POSTGRES_DOCKER_NAME}:db -v ${DUMP_DIR}:/backup -e PGHOST=`$docker_cmd inspect -f \"{{ .NetworkSettings.IPAddress }}\" ${POSTGRES_DOCKER_NAME}` -e PGUSER=postgres postgres:${POSTGRES_VERSION} pg_restore -d postgres /backup/${DUMP_FILE}"
|
RESTORE_COMMAND="$docker_cmd run -it --rm --link ${POSTGRES_DOCKER_NAME}:db -v ${DUMP_DIR}:/backup -e PGHOST=`$docker_cmd inspect -f \"{{ .NetworkSettings.IPAddress }}\" ${POSTGRES_DOCKER_NAME}` -e PGUSER=postgres postgres:${POSTGRES_VERSION} pg_restore -d postgres /backup/${DUMP_FILE}"
|
||||||
exec $RESTORE_COMMAND || error_and_quit "Failed to launch this command: ${CMD}"
|
exec $RESTORE_COMMAND || error_and_quit "Failed to launch this command: ${CMD}"
|
||||||
|
Loading…
Reference in New Issue
Block a user