Fix wrong backupDir var, add ca-certs to alpine images to fix x509 CA…

… cert error for s3
percona · Dec 20, 2018 · f1ee7ce · f1ee7ce
1 parent 3a797b2
commit f1ee7ce
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 1 deletion.
diff --git a/docker/agent/Dockerfile b/docker/agent/Dockerfile
@@ -1,5 +1,7 @@
 FROM alpine
 
+RUN apk update && apk add ca-certificates && rm -rf /var/cache/apk/*
+
 ADD pbm-agent /usr/local/bin/pbm-agent
 
 RUN adduser -h /data -S pbm-agent

diff --git a/docker/coordinator/Dockerfile b/docker/coordinator/Dockerfile
@@ -1,5 +1,7 @@
 FROM alpine
 
+RUN apk update && apk add ca-certificates && rm -rf /var/cache/apk/*
+
 ADD pbm-coordinator /usr/local/bin/pbm-coordinator
 
 RUN adduser -h /data -S pbm-coordinator

diff --git a/docker/pbmctl/Dockerfile b/docker/pbmctl/Dockerfile
@@ -1,5 +1,7 @@
 FROM alpine
 
+RUN apk update && apk add ca-certificates && rm -rf /var/cache/apk/*
+
 ADD pbmctl /usr/local/bin/pbmctl
 
 RUN adduser -h /data -S pbmctl

diff --git a/grpc/client/client.go b/grpc/client/client.go
@@ -935,7 +935,7 @@ func (c *Client) runDBBackup(msg *pb.StartBackup, sess *session.Session) {
 			return
 		}
 		if !exists {
-			if err := awsutils.CreateBucket(svc, msg.GetDestinationDir()); err != nil {
+			if err := awsutils.CreateBucket(svc, c.backupDir); err != nil {
 				c.sendDBBackupFinishError(fmt.Errorf("cannot create s3 bucket %q for dbBackup: %s", c.backupDir, err))
 				return
 			}