Ensure image pull secret configuration is valid

Signed-off-by: Manuel Alejandro de Brito Fontes <[email protected]>

Author: aledbf

Makefile

@@ -11,23 +11,30 @@ ifneq (,$(wildcard ./.env))
     export
 endif
 
+ifneq ($(IMAGE_PULL_SECRET_FILE),)
+	IMAGE_PULL_SECRET=--volume $(shell realpath ${IMAGE_PULL_SECRET_FILE}):/gitpod/config.json
+else
+	IMAGE_PULL_SECRET=
+endif
+
 build: ## Build docker image containing the required tools for the installation
-	@docker build --quiet . -t ${IMG}
+	@docker build --squash --quiet . -t ${IMG}
 	@mkdir -p ${PWD}/logs
 
 DOCKER_RUN_CMD = docker run -it \
+	--pull always \
 	--env-file ${PWD}/.env \
 	--env NODE_ENV=production \
 	--volume ${PWD}/.kubeconfig:/gitpod/.kubeconfig \
-	--volume $(shell realpath ${IMAGE_PULL_SECRET_FILE}):/gitpod/config.json \
+	$(IMAGE_PULL_SECRET) \
 	--volume ${PWD}/eks-cluster.yaml:/gitpod/eks-cluster.yaml \
 	--volume ${PWD}/logs:/root/.npm/_logs \
 	--volume ${HOME}/.aws:/root/.aws \
 	${IMG} $(1)
 
 install: ## Install Gitpod
 	@echo "Starting install process..."
-	touch ${PWD}/.kubeconfig
+	@touch ${PWD}/.kubeconfig
 	@$(call DOCKER_RUN_CMD, --install)
 
 uninstall: ## Uninstall Gitpod

lib/gitpod.ts

@@ -53,9 +53,10 @@ export class GitpodStack extends cdk.Stack {
 
             replace(/{{issuerName}}/g, 'ca-issuer');
 
+
         const values = loadYaml(doc);
+        createNestedObject(values, ["components", "imageBuilderMk3", "registry"], {});
         if (process.env.IMAGE_PULL_SECRET_FILE) {
-            createNestedObject(values, ["components", "imageBuilderMk3", "registry"], {});
             values.components.imageBuilderMk3.registry.secretName = "gitpod-image-pull-secret";
         }