Merge pull request #60 from Christine-horrocks/katylouise/image_url_d…

…ocker

Added necessary environment variables for tests in GoCD

Dockerfile

@@ -12,6 +12,8 @@ ARG APPLICATION_INSIGHTS_INSTRUMENTATION_KEY
 ARG RAILS_LOG_TO_STDOUT
 ARG SECRET_KEY_BASE
 ARG RACK_ENV=production
+ARG IMAGE_SERVICE_URL
+ARG PARLIAMENT_BASE_URL
 
 # Add Gemfiles.
 ADD Gemfile /app/
@@ -55,6 +57,8 @@ ENV RAILS_LOG_TO_STDOUT $RAILS_LOG_TO_STDOUT
 ENV RACK_ENV $RACK_ENV
 ENV SECRET_KEY_BASE $SECRET_KEY_BASE
 ENV RAILS_SERVE_STATIC_FILES true
+ENV IMAGE_SERVICE_URL $IMAGE_SERVICE_URL
+ENV PARLIAMENT_BASE_URL $PARLIAMENT_BASE_URL
 
 # Add additional labels to our image
 ARG GIT_SHA=unknown

Makefile

@@ -86,6 +86,8 @@ build: # Using the variables defined above, run `docker build`, tagging the imag
 		--build-arg RACK_ENV=$(RACK_ENV) \
 		--build-arg GIT_SHA="$(GIT_SHA)" \
 		--build-arg GIT_TAG="$(GIT_TAG)" \
+		--build-arg IMAGE_SERVICE_URL="$(IMAGE_SERVICE_URL)" \
+		--build-arg PARLIAMENT_BASE_URL="$(PARLIAMENT_BASE_URL)" \
 		.
 
 run: # Run the Docker image we have created, mapping the HOST_PORT and CONTAINER_PORT