From d474f8084d88e41c0508e7a48d23a6c5e871fa24 Mon Sep 17 00:00:00 2001 From: eiabea Date: Wed, 17 Jan 2018 09:57:14 +0100 Subject: [PATCH 1/2] Fixed readme to match new backup file naming --- README.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index fb26265a..f5bc104a 100644 --- a/README.md +++ b/README.md @@ -1097,18 +1097,18 @@ docker run --name gitlab -it --rm [OPTIONS] \ The list of all available backups will be displayed in reverse chronological order. Select the backup you want to restore and continue. -To avoid user interaction in the restore operation, specify the timestamp of the backup using the `BACKUP` argument to the rake task. +To avoid user interaction in the restore operation, specify the timestamp, date and version of the backup using the `BACKUP` argument to the rake task. ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:10.3.3 app:rake gitlab:backup:restore BACKUP=1417624827 + sameersbn/gitlab:10.3.3 app:rake gitlab:backup:restore BACKUP=1515629493_2018_01_11_10.3.3 ``` When using `docker-compose` you may use the following command to execute the restore. ```bash docker-compose run --rm gitlab app:rake gitlab:backup:restore # List available backups -docker-compose run --rm gitlab app:rake gitlab:backup:restore BACKUP=1417624827 # Choose to restore from 1417624827 +docker-compose run --rm gitlab app:rake gitlab:backup:restore BACKUP=1515629493_2018_01_11_10.3.3 # Choose to restore from 1515629493 ``` ## Host Key Backups (ssh) From ca65e1926a8bfac5585ae9341afbd99b61c121e7 Mon Sep 17 00:00:00 2001 From: eiabea Date: Wed, 17 Jan 2018 16:41:50 +0100 Subject: [PATCH 2/2] Retrigger travis build