More improvements to staging workflow

Compose.Dockerfile

@@ -9,5 +9,8 @@ WORKDIR /app
 COPY .env /app/
 COPY docker-compose.yml /app/
 COPY docker-compose.staging.yml /app/
+# Can't reset these values with overlay unfortunately
+RUN grep -v 'context: .' /app/docker-compose.yml | grep -v 'build:' > /app/docker-compose.yml.2
+RUN mv /app/docker-compose.yml.2 /app/docker-compose.yml
 
 CMD ["/usr/local/bin/docker", "compose", "-f", "/app/docker-compose.yml", "-f", "docker-compose.staging.yml", "up"]

Makefile

@@ -93,6 +93,8 @@ gocd: ## Build GoCD pipelines
 HEAD_SHA:=$(shell git rev-parse --short HEAD)
 TIME:=$(shell date +%F.%T)
 SEER_STAGING_VERSION_SHA:=$(HEAD_SHA).$(TIME)
+export SENTRY_ORG:=sentry
+export SENTRY_PROJECT:=seer
 push-staging:
 	# Ensure the google authentication helper is working.  If this fails, https://cloud.google.com/artifact-registry/docs/docker/authentication#gcloud-helper
 	gcloud auth configure-docker us-west1-docker.pkg.dev > /dev/null

docker-compose.staging.yml

@@ -1,5 +1,4 @@
 services:
-    build: null
     app:
         image: us-west1-docker.pkg.dev/${SBX_PROJECT}/staging/seer
         command: bash -c "