allow overriding workdir for containers

Author: ekini

cmd/deploy.go

@@ -43,6 +43,7 @@ If deployment failed, then rolls back to the previous stack definition.`,
 			viper.GetString("image_tag"),
 			viper.GetStringSlice("image_tags"),
 			viper.GetStringSlice("deploy.services"),
+			viper.GetString("workdir"),
 		)
 		if err != nil {
 			log.WithError(err).Errorf("Deployment failed with code %d", exitCode)

cmd/root.go

@@ -48,11 +48,13 @@ func init() {
 	rootCmd.PersistentFlags().BoolVarP(&debug, "debug", "d", false, "Show debug output")
 	rootCmd.PersistentFlags().StringP("cluster", "c", "", "name of cluster (required)")
 	rootCmd.PersistentFlags().StringP("profile", "p", "", "name of AWS profile to use, which is set in ~/.aws/config")
+	rootCmd.PersistentFlags().StringP("workdir", "w", "", "Set working directory")
 	rootCmd.PersistentFlags().StringP("image_tag", "", "", "Overrides the docker image tag in all container definitions. Overrides \"--image-tags\" flag.")
 	rootCmd.PersistentFlags().StringSliceP("image_tags", "", []string{}, "Modifies the docker image tags in container definitions. Can be specified several times, one for each container definition. Also takes comma-separated values in one tag. I.e. if there are 2 containers and --image-tags is set once to \"new\", then the image tag of the first container will be modified, leaving the second one untouched. Gets overridden by  \"--image-tag\". If you have 3 container definitions and want to modify tags for the 1st and the 3rd, but leave the 2nd unchanged, specify it as \"--image_tags first_tag,,last_tag\".")
 
 	viper.BindPFlag("profile", rootCmd.PersistentFlags().Lookup("profile"))
 	viper.BindPFlag("cluster", rootCmd.PersistentFlags().Lookup("cluster"))
+	viper.BindPFlag("workdir", rootCmd.PersistentFlags().Lookup("workdir"))
 	viper.BindPFlag("image_tag", rootCmd.PersistentFlags().Lookup("image_tag"))
 	viper.BindPFlag("image_tags", rootCmd.PersistentFlags().Lookup("image_tags"))
 

cmd/run.go

@@ -35,6 +35,7 @@ It can modify the container command.
 			viper.GetString("task_definition"),
 			viper.GetString("image_tag"),
 			viper.GetStringSlice("image_tags"),
+			viper.GetString("workdir"),
 			containerName,
 			viper.GetString("log_group"),
 			viper.GetString("run.launch_type"),

lib/deploy.go

@@ -11,7 +11,7 @@ import (
 )
 
 // DeployServices deploys specified services in parallel
-func DeployServices(profile, cluster, imageTag string, imageTags, services []string) (exitCode int, err error) {
+func DeployServices(profile, cluster, imageTag string, imageTags, services []string, workDir string) (exitCode int, err error) {
 	ctx := log.WithFields(log.Fields{
 		"cluster":   cluster,
 		"image_tag": imageTag,
@@ -30,7 +30,7 @@ func DeployServices(profile, cluster, imageTag string, imageTags, services []str
 		wg.Add(1)
 		go func() {
 			defer wg.Done()
-			deployService(ctx, cluster, imageTag, imageTags, service, exits, rollback, &wg)
+			deployService(ctx, cluster, imageTag, imageTags, workDir, service, exits, rollback, &wg)
 		}()
 	}
 
@@ -52,7 +52,7 @@ func DeployServices(profile, cluster, imageTag string, imageTags, services []str
 	return
 }
 
-func deployService(ctx log.Interface, cluster, imageTag string, imageTags []string, service string, exitChan chan int, rollback chan bool, wg *sync.WaitGroup) {
+func deployService(ctx log.Interface, cluster, imageTag string, imageTags []string, workDir, service string, exitChan chan int, rollback chan bool, wg *sync.WaitGroup) {
 	ctx = ctx.WithFields(log.Fields{
 		"service": service,
 	})
@@ -90,7 +90,7 @@ func deployService(ctx log.Interface, cluster, imageTag string, imageTags []stri
 
 	taskDefinition := describeTaskResult.TaskDefinition
 	// replace the image tag if there is any
-	if err := modifyContainerDefinitionImages(imageTag, imageTags, taskDefinition.ContainerDefinitions, ctx); err != nil {
+	if err := modifyContainerDefinitionImages(imageTag, imageTags, workDir, taskDefinition.ContainerDefinitions, ctx); err != nil {
 		ctx.WithError(err).Error("Can't modify container definition images")
 		exitChan <- 1
 	}

lib/run.go

@@ -9,7 +9,7 @@ import (
 )
 
 // RunTask runs the specified one-off task in the cluster using the task definition
-func RunTask(profile, cluster, service, taskDefinitionName, imageTag string, imageTags []string, containerName, awslogGroup, launchType string, args []string) (exitCode int, err error) {
+func RunTask(profile, cluster, service, taskDefinitionName, imageTag string, imageTags []string, workDir, containerName, awslogGroup, launchType string, args []string) (exitCode int, err error) {
 	err = makeSession(profile)
 	if err != nil {
 		return 1, err
@@ -28,7 +28,7 @@ func RunTask(profile, cluster, service, taskDefinitionName, imageTag string, ima
 	taskDefinition := describeResult.TaskDefinition
 
 	var foundContainerName bool
-	if err := modifyContainerDefinitionImages(imageTag, imageTags, taskDefinition.ContainerDefinitions, ctx); err != nil {
+	if err := modifyContainerDefinitionImages(imageTag, imageTags, workDir, taskDefinition.ContainerDefinitions, ctx); err != nil {
 		return 1, err
 	}
 	for n, containerDefinition := range taskDefinition.ContainerDefinitions {

lib/util.go

@@ -94,7 +94,7 @@ func fetchCloudWatchLog(cluster, containerName, awslogGroup, taskUUID string, de
 	return printCloudWatchLogs(awslogGroup, streamName)
 }
 
-func modifyContainerDefinitionImages(imageTag string, imageTags []string, containerDefinitions []*ecs.ContainerDefinition, ctx log.Interface) error {
+func modifyContainerDefinitionImages(imageTag string, imageTags []string, workDir string, containerDefinitions []*ecs.ContainerDefinition, ctx log.Interface) error {
 
 	for n, containerDefinition := range containerDefinitions {
 		ctx := ctx.WithField("container_name", aws.StringValue(containerDefinition.Name))
@@ -120,10 +120,13 @@ func modifyContainerDefinitionImages(imageTag string, imageTags []string, contai
 					"old_tag": imageWithTag[1],
 				}).Debug("Image tag changed")
 			}
-
 		} else {
 			ctx.Debug("Container doesn't seem to have a tag in the image. It's safer to not do anything.")
 		}
+		if workDir != "" {
+			containerDefinitions[n].WorkingDirectory = aws.String(workDir)
+			ctx.WithField("workdir", workDir).Debug("Workdir changed")
+		}
 
 	}
 	return nil