Added workaround for not being able to use build args in entrypoint

.dockerignore

@@ -1,2 +1,3 @@
 .vscode
 auth-wrapper
+Dockerfile

Dockerfile

@@ -1,5 +1,5 @@
 ARG WRAP_IMAGE
-ARG WRAP_ENTRYPOINT
+ARG WRAP_COMMAND
 ARG SSH_KEY_PATH
 
 # Build image
@@ -23,12 +23,12 @@ RUN CGO_ENABLED=0 GOOS=linux go build -o auth-wrapper -ldflags "-X 'main.version
 # Production image
 FROM ${WRAP_IMAGE} as production
 
-ARG WRAP_ENTRYPOINT
-ENV WRAP_ENTRYPOINT=${WRAP_ENTRYPOINT}
+ARG WRAP_COMMAND
+ENV WRAP_COMMAND=${WRAP_COMMAND}
 
 ARG SSH_KEY_PATH
 ENV SSH_KEY_PATH=${SSH_KEY_PATH}
 
 COPY --from=builder /app/auth-wrapper /opt/auth-wrapper
 
-ENTRYPOINT [ "/opt/auth-wrapper", "${WRAP_ENTRYPOINT}" ]
+ENTRYPOINT ["/opt/auth-wrapper"]

cloudbuild.yaml

@@ -20,7 +20,7 @@ steps:
     args: [
       'build',
       '--build-arg=WRAP_IMAGE=gcr.io/cloud-builders/git',
-      '--build-arg=WRAP_ENTRYPOINT=git',
+      '--build-arg=WRAP_COMMAND=git',
       '--build-arg=SSH_KEY_PATH=kms://projects/connectedcars-staging/locations/global/keyRings/cloudbuilder/cryptoKeys/ssh-key/cryptoKeyVersions/3',
       '--tag=gcr.io/$PROJECT_ID/$REPO_NAME-git.$BRANCH_NAME:$COMMIT_SHA', 
       '--tag=gcr.io/$PROJECT_ID/$REPO_NAME-git.$BRANCH_NAME:latest', 
@@ -31,7 +31,7 @@ steps:
     args: [
       'build',
       '--build-arg=WRAP_IMAGE=gcr.io/cloud-builders/docker',
-      '--build-arg=WRAP_ENTRYPOINT=docker',
+      '--build-arg=WRAP_COMMAND=docker',
       '--build-arg=SSH_KEY_PATH=kms://projects/connectedcars-staging/locations/global/keyRings/cloudbuilder/cryptoKeys/ssh-key/cryptoKeyVersions/3',
       '--tag=gcr.io/$PROJECT_ID/$REPO_NAME-docker.$BRANCH_NAME:$COMMIT_SHA', 
       '--tag=gcr.io/$PROJECT_ID/$REPO_NAME-docker.$BRANCH_NAME:latest', 

cmd/main.go

@@ -18,9 +18,21 @@ func main() {
 	os.Unsetenv("SSH_KEY_PATH")
 	os.Unsetenv("SSH_KEY_PASSWORD")
 
-	// Setup exec command
-	command := os.Args[1]
-	args := os.Args[2:]
+	var command string
+	var args []string
+	wrapCommand := os.Getenv("WRAP_COMMAND")
+	if wrapCommand != "" {
+		command = wrapCommand
+		args = os.Args[1:]
+	} else {
+		if len(os.Args) < 2 {
+			fmt.Fprintf(os.Stderr, "auth-wrapper cmd args")
+			os.Exit(1)
+		}
+		// Setup exec command
+		command = os.Args[1]
+		args = os.Args[2:]
+	}
 
 	exitCode, err := runWithSSHAgent(command, args, sshKeyPath, sshKeyPassword)
 	if err != nil {
@@ -77,10 +89,6 @@ func runWithSSHAgent(command string, args []string, sshKeyPath string, sshKeyPas
 	cmd.Stdout = os.Stdout
 	cmd.Stderr = os.Stderr
 
-	if len(os.Args) < 2 {
-		return 1, fmt.Errorf("auth-wrapper cmd args")
-	}
-
 	if err := cmd.Start(); err != nil {
 		return 1, fmt.Errorf("cmd.Start: %v", err)
 	}