From fae75609a0402a716001aa266079ccd7dfa87373 Mon Sep 17 00:00:00 2001
From: Joe Wallwork <jw2423@cam.ac.uk>
Date: Thu, 29 Aug 2024 16:54:22 +0100
Subject: [PATCH] Use Ubuntu 22.04 rather than latest; provide path to
 Dockerfile; avoid --no-cache

---
 docker/Dockerfile.devenv | 2 +-
 docker/Makefile          | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/docker/Dockerfile.devenv b/docker/Dockerfile.devenv
index 813365c..57d950e 100644
--- a/docker/Dockerfile.devenv
+++ b/docker/Dockerfile.devenv
@@ -26,7 +26,7 @@ RUN cd /opt/spack-environment \
     && spack env activate --sh -d . > activate.sh
 
 # Bare OS image to run the installed executables
-FROM ubuntu:latest
+FROM ubuntu:22.04
 
 # Copy necessary files from the builder stage
 COPY --from=builder /opt/spack-environment /opt/spack-environment
diff --git a/docker/Makefile b/docker/Makefile
index b26aa68..fd75b68 100644
--- a/docker/Makefile
+++ b/docker/Makefile
@@ -1,6 +1,6 @@
 all: build
 
-DOCKERFILE 	= Dockerfile.devenv
+DOCKERFILE 	= ${GISS_HOME}/docker/Dockerfile.devenv
 NAMESPACE 	= ghcr.io/fetch4
 IMAGE_NAME	= giss-gc-dev-env
 TAG 				= latest
@@ -11,7 +11,7 @@ pull:
 	docker pull $(IMAGE)
 
 build:
-	docker build -f $(DOCKERFILE) -t $(IMAGE) --no-cache .
+	docker build -f $(DOCKERFILE) -t $(IMAGE) .
 
 run:
 	docker run --rm -it -v ${HOME}:${HOME} $(IMAGE)