removing execution_image command line arg to env variable

Author: nour-massri

deploy/saturn/main.tf

@@ -86,7 +86,6 @@ module "container" {
       "-secret=${var.secret_id}",
       "-subscription=${google_pubsub_subscription.queue.name}",
       "-parallel=${var.parallelism}",
-      "-execution-image=${var.image}",
     ]
 
     # Environment variables for Docker-in-Docker path translation
@@ -98,6 +97,10 @@ module "container" {
       {
         name  = "SCAFFOLD_CONTAINER_PATH"
         value = "/scaffolds"
+      },
+      {
+        name = "EXECUTION_IMAGE"
+        value = "${var.image}"
       }
     ]
 

saturn/cmd/saturn/main.go

@@ -28,7 +28,7 @@ var (
 	scaffoldRoot                *string = flag.String("scaffold", "/scaffolds", "the root directory for saving scaffolds")
 	parallelism                 *uint   = flag.Uint("parallel", 1, "the number of scaffolds to run in parallel")
 	onSaturn                    *bool   = flag.Bool("onsaturn", true, "run on saturn")
-	executionImage              *string = flag.String("execution-image", "", "the docker image to isolate compile/execution tasks")
+	executionImage              *string = flag.String("execution-image", os.Getenv("EXECUTION_IMAGE"), "the docker image to isolate compile/execution tasks")
 )
 
 func main() {

saturn/development/docker-compose.yml

@@ -32,6 +32,7 @@ services:
       - RUN_ID=${RUN_ID:-default}
       - SCAFFOLD_HOST_PATH=${PWD}/${SCAFFOLD_DIR:-scaffolds}
       - SCAFFOLD_CONTAINER_PATH=/scaffolds
+      - EXECUTION_IMAGE=development-saturn
     volumes:
       - ./:/development
       - ${SCAFFOLD_DIR:-./scaffolds}:/scaffolds
@@ -43,7 +44,6 @@ services:
       -onsaturn=false
       -secret=/development/secrets/secret.json
       -scaffold=/scaffolds
-      -execution-image=development-saturn
     depends_on:
       pubsub-emulator:
         condition: service_healthy