Allow Gemfile path to be overridden

Author: Jberlinsky

Makefile

@@ -16,8 +16,9 @@
 SHELL := /usr/bin/env bash
 
 # Docker build config variables
+DOCKER_ORG := gcr.io/cloud-foundation-cicd
 DOCKER_TAG_KITCHEN_TERRAFORM ?= 0.11.10_216.0.0_1.19.1_0.1.10
-DOCKER_REPO_BASE_KITCHEN_TERRAFORM := gcr.io/cloud-foundation-cicd/cft/kitchen-terraform:${DOCKER_TAG_KITCHEN_TERRAFORM}
+DOCKER_REPO_BASE_KITCHEN_TERRAFORM := ${DOCKER_ORG}/cft/kitchen-terraform:${DOCKER_TAG_KITCHEN_TERRAFORM}
 DOCKER_IMAGE_KITCHEN_TERRAFORM := cft/kitchen-terraform_terraform-google-kubernetes-engine
 
 # All is the first target in the file so it will get picked up when you just run 'make' on its own
@@ -94,6 +95,12 @@ docker_build_kitchen_terraform:
 		--build-arg BASE_IMAGE=${DOCKER_REPO_BASE_KITCHEN_TERRAFORM} \
 		-t ${DOCKER_IMAGE_KITCHEN_TERRAFORM}:${DOCKER_TAG_KITCHEN_TERRAFORM} .
 
+# Push Docker image
+.PHONY: docker_push_kitchen_terraform
+docker_push_kitchen_terraform:
+	docker tag ${DOCKER_IMAGE_KITCHEN_TERRAFORM}:${DOCKER_TAG_KITCHEN_TERRAFORM} ${DOCKER_ORG}/${DOCKER_IMAGE_KITCHEN_TERRAFORM}:${DOCKER_TAG_KITCHEN_TERRAFORM}
+	docker push ${DOCKER_ORG}/${DOCKER_IMAGE_KITCHEN_TERRAFORM}:${DOCKER_TAG_KITCHEN_TERRAFORM}
+
 # Run docker
 .PHONY: docker_run
 docker_run:

build/docker/kitchen_terraform/Dockerfile

@@ -23,6 +23,6 @@ ADD https://storage.googleapis.com/kubernetes-release/release/v1.12.2/bin/linux/
 RUN chmod +x /usr/local/bin/kubectl
 
 WORKDIR /opt/kitchen
-COPY ./Gemfile /opt/kitchen/
+COPY Gemfile .
 RUN bundle install
 WORKDIR $APP_BASE_DIR/workdir