revert to previous way of building kbfsfuse image

keybase · Apr 22, 2020 · 353a05b · 353a05b
1 parent 6d708a8
commit 353a05b
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 1 deletion.
diff --git a/Jenkinsfile b/Jenkinsfile
@@ -218,7 +218,14 @@ helpers.rootLinuxNode(env, {
                       sh "go install -ldflags \"-s -w\" -buildmode=pie github.com/keybase/client/go/kbfs/kbfsgit/git-remote-keybase"
                       sh "cp ${env.GOPATH}/bin/git-remote-keybase ./kbfsgit/git-remote-keybase/git-remote-keybase"
                       withCredentials([[$class: 'StringBinding', credentialsId: 'kbfs-docker-cert-b64-new', variable: 'KBFS_DOCKER_CERT_B64']]) {
-                        kbfsfuseImage = docker.build('897413463132.dkr.ecr.us-east-1.amazonaws.com/client', "--build-arg KEYBASE_TEST_ROOT_CERT_PEM_B64='$KBFS_DOCKER_CERT_B64' .")
+                        sh '''
+                          set +x
+                          KBFS_DOCKER_CERT="$(echo $KBFS_DOCKER_CERT_B64 | sed 's/ //g' | base64 -d)"
+                          docker build -t 897413463132.dkr.ecr.us-east-1.amazonaws.com/client \
+                              --build-arg KEYBASE_TEST_ROOT_CERT_PEM="$KBFS_DOCKER_CERT" \
+                              --build-arg KEYBASE_TEST_ROOT_CERT_PEM_B64="$KBFS_DOCKER_CERT_B64" .
+                        '''
+                        kbfsfuseImage = docker.image('897413463132.dkr.ecr.us-east-1.amazonaws.com/client')
                       }
                       docker.withRegistry('https://897413463132.dkr.ecr.us-east-1.amazonaws.com', 'ecr:us-east-1:aws-ecr-user') {
                         kbfsfuseImage.push(env.BUILD_TAG)

diff --git a/go/kbfs/Dockerfile b/go/kbfs/Dockerfile
@@ -2,8 +2,10 @@ FROM kbclient
 MAINTAINER Keybase <admin@keybase.io>
 
 ARG KEYBASE_TEST_ROOT_CERT_PEM_B64
+ARG KEYBASE_TEST_ROOT_CERT_PEM
 
 ENV KEYBASE_TEST_ROOT_CERT_PEM_B64=$KEYBASE_TEST_ROOT_CERT_PEM_B64 \
+    KEYBASE_TEST_ROOT_CERT_PEM=$KEYBASE_TEST_ROOT_CERT_PEM \
     KEYBASE_DEBUG=1
 
 ENTRYPOINT ["kbfsfuse.sh"]