Allow absolute URI specification for action images

cmd/tink-worker/cmd/root.go

@@ -40,6 +40,7 @@ func NewRootCommand(version string, logger log.Logger) *cobra.Command {
 			user := viper.GetString("registry-username")
 			pwd := viper.GetString("registry-password")
 			registry := viper.GetString("docker-registry")
+			useAbsoluteImageURI := viper.GetBool("use-absolute-image-uri")
 			captureActionLogs := viper.GetBool("capture-action-logs")
 
 			logger.With("version", version).Info("starting")
@@ -61,9 +62,10 @@ func NewRootCommand(version string, logger log.Logger) *cobra.Command {
 				logger,
 				dockerClient,
 				worker.RegistryConnDetails{
-					Registry: registry,
-					Username: user,
-					Password: pwd,
+					Registry:            registry,
+					Username:            user,
+					Password:            pwd,
+					UseAbsoluteImageURI: useAbsoluteImageURI,
 				})
 
 			logCapturer := worker.NewDockerLogCapturer(dockerClient, logger, os.Stdout)
@@ -96,6 +98,7 @@ func NewRootCommand(version string, logger log.Logger) *cobra.Command {
 	rootCmd.Flags().StringP("docker-registry", "r", "", "Sets the Docker registry (DOCKER_REGISTRY)")
 	rootCmd.Flags().StringP("registry-username", "u", "", "Sets the registry username (REGISTRY_USERNAME)")
 	rootCmd.Flags().StringP("registry-password", "p", "", "Sets the registry-password (REGISTRY_PASSWORD)")
+	rootCmd.Flags().BoolP("use-absolute-image-uri", "a", false, "Do not prepend docker_registry to template action images (USE_ABSOLUTE_IMAGE_URI)")
 
 	must := func(err error) {
 		if err != nil {

cmd/tink-worker/worker/container_manager.go

@@ -48,8 +48,13 @@ func NewContainerManager(logger log.Logger, cli DockerClient, registryDetails Re
 
 func (m *containerManager) CreateContainer(ctx context.Context, cmd []string, wfID string, action *pb.WorkflowAction, captureLogs, privileged bool) (string, error) {
 	l := m.getLogger(ctx)
+
+	actionImage := action.GetImage()
+	if !m.registryDetails.UseAbsoluteImageURI && len(m.registryDetails.Registry) > 0 {
+		actionImage = path.Join(m.registryDetails.Registry, action.GetImage())
+	}
 	config := &container.Config{
-		Image:        path.Join(m.registryDetails.Registry, action.GetImage()),
+		Image:        actionImage,
 		AttachStdout: true,
 		AttachStderr: true,
 		Cmd:          cmd,

cmd/tink-worker/worker/registry.go

@@ -13,9 +13,10 @@ import (
 
 // RegistryConnDetails are the connection details for accessing a Docker registry.
 type RegistryConnDetails struct {
-	Registry string
-	Username string
-	Password string
+	Registry            string
+	Username            string
+	Password            string
+	UseAbsoluteImageURI bool
 }
 
 // ImagePullStatus is the status of the downloaded Image chunk.
@@ -43,7 +44,12 @@ func (m *containerManager) PullImage(ctx context.Context, image string) error {
 	}
 	authStr := base64.URLEncoding.EncodeToString(encodedJSON)
 
-	out, err := m.cli.ImagePull(ctx, path.Join(m.registryDetails.Registry, image), types.ImagePullOptions{RegistryAuth: authStr})
+	imageURI := image
+	if !m.registryDetails.UseAbsoluteImageURI && len(m.registryDetails.Registry) > 0 {
+		imageURI = path.Join(m.registryDetails.Registry, image)
+	}
+
+	out, err := m.cli.ImagePull(ctx, imageURI, types.ImagePullOptions{RegistryAuth: authStr})
 	if err != nil {
 		return errors.Wrap(err, "DOCKER PULL")
 	}