Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Enable pipefail and update restore yamls #750

Merged
merged 4 commits into from Apr 19, 2019
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
3 changes: 1 addition & 2 deletions docs/examples/mongo/restore.yaml
Expand Up @@ -17,5 +17,4 @@ spec:
kind: AppBinding
name: mgo-quickstart
rules:
- hosts:
- host-0
- snapshots: [latest]
3 changes: 1 addition & 2 deletions docs/examples/mysql/restore.yaml
Expand Up @@ -17,5 +17,4 @@ spec:
kind: AppBinding
name: mysql-quickstart
rules:
- hosts:
- host-0
- snapshots: [latest]
3 changes: 1 addition & 2 deletions docs/examples/pg/restore.yaml
Expand Up @@ -17,5 +17,4 @@ spec:
kind: AppBinding
name: quick-postgres
rules:
- hosts:
- host-0
- snapshots: [latest]
3 changes: 1 addition & 2 deletions docs/examples/pvc/restore.yaml
Expand Up @@ -18,8 +18,7 @@ spec:
name: test-pvc-dest
mountPath: /etc/target
rules:
- hosts:
- host-0
- snapshots: [latest]
paths:
- /etc/target/dir-01
- /etc/target/dir-02
3 changes: 1 addition & 2 deletions docs/examples/pvc/restore_error.yaml
Expand Up @@ -18,7 +18,6 @@ spec:
name: test-pvc-dest
mountPath: /etc/target
rules:
- hosts:
- host-0
- snapshots: [latest]
paths:
- /etc/target/unknown-path
3 changes: 1 addition & 2 deletions docs/examples/rest/restore.yaml
Expand Up @@ -20,8 +20,7 @@ spec:
- name: mount-01
mountPath: /etc/target
rules:
- hosts:
- host-0
- snapshots: [latest]
paths:
- /etc/target/dir-01
- /etc/target/dir-02
13 changes: 4 additions & 9 deletions glide.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion pkg/restic/commands.go
Expand Up @@ -205,7 +205,7 @@ func (w *ResticWrapper) restore(path, host, snapshotID, destination string) ([]b
func (w *ResticWrapper) dump(dumpOptions DumpOptions) ([]byte, error) {
log.Infoln("Dumping backed up data")

args := []interface{}{"dump"}
args := []interface{}{"dump", "--quiet"}
if dumpOptions.Snapshot != "" {
args = append(args, dumpOptions.Snapshot)
} else {
Expand Down
2 changes: 2 additions & 0 deletions pkg/restic/config.go
Expand Up @@ -77,6 +77,8 @@ func NewResticWrapper(options SetupOptions) (*ResticWrapper, error) {
}
wrapper.sh.SetDir(wrapper.config.ScratchDir)
wrapper.sh.ShowCMD = true
wrapper.sh.PipeFail = true
wrapper.sh.PipeStdErrors = true

// Setup restic environments
err := wrapper.setupEnv()
Expand Down
21 changes: 0 additions & 21 deletions vendor/github.com/Sirupsen/logrus/LICENSE

This file was deleted.