update devcontainer Dockerfile

Author: simongregersen

docker_image/Dockerfile

@@ -1,41 +1,15 @@
 ARG BASE_IMAGE
 FROM ${BASE_IMAGE}
 
-# We need to be root to install system dependencies
-USER root
-RUN apt-get update && apt-get install -y \
-    gawk git pkg-config libgmp-dev libmpfr-dev libunwind-dev autoconf \
-    && rm -rf /var/lib/apt/lists/*
-
-# We need to be root to install system dependencies,
-# but opam usually runs as a user. Assuming the base image
-# has a user 'opam', we switch to it.
-USER opam
-WORKDIR /home/opam/iris-tutorial
-
-ARG OPAMYES=true
-ENV OPAMROOTISOK=true
-ARG MODE
-
-# 3. Combined Opam Operation
-# This is the "Magic" fix: Adding repos, updating, and installing in ONE step
-# ensures the package solver doesn't use a stale cache.
 RUN opam repo add rocq-released https://rocq-prover.org/opam/released --all --set-default && \
     opam repo add iris-dev https://gitlab.mpi-sws.org/iris/opam.git --all --set-default && \
     opam update
 
-# TODO: uncomment when vsrocq-language-server will start supporting ocaml 5.5
-# RUN opam install -y -w vsrocq-language-server.2.4.3
+COPY --from=repo iris-tutorial.opam .
+RUN opam install . --deps-only -y && \
+    opam install -y rocq-iris-unstable
 
-# 4. Copy the opam file
-COPY --chown=opam:opam iris-tutorial.opam .
-
-# 5. Install Project Dependencies
-RUN opam install . --deps-only -y
-
-# 4. If mode is unstable, install the extra unstable package
-RUN if [ "$MODE" = "unstable" ]; then \
-    opam install -y rocq-iris-unstable; \
-    fi
+# TODO: uncomment when vsrocq-language-server will start supporting ocaml 5.5
+# RUN opam install -y -w vsrocq-language-server
 
 RUN echo "eval \$(opam env)" >> ~/.bashrc

docker_image/Makefile

@@ -1,60 +1,27 @@
 REGISTRY := ghcr.io/logsem/iris-tutorial
-OCAML_VER := 5.5
-MODE ?= stable
-
-# Logic for Base Image and Tags
-ifeq ($(MODE),unstable)
-    BASE_IMAGE := ocaml/opam:debian-unstable-ocaml-5.5
-    IMAGE_NAME := debian-unstable-ocaml-$(OCAML_VER)
-else
-    BASE_IMAGE := ocaml/opam:debian-ocaml-5.5
-    IMAGE_NAME := debian-ocaml-$(OCAML_VER)
-endif
+BASE_IMAGE := ocaml/opam:debian-12-ocaml-5.4
 
 default:
-	@echo 'Usage: make [stable-x86-64 | unstable-x86-64 | stable-arm64 | unstable-arm64]'
-
-# Internal build logic
-build-%:
-	$(eval ARCH_RAW := $*)
-	$(eval PLATFORM := $(if $(filter x86-64,$(ARCH_RAW)),linux/amd64,linux/arm64))
-	$(eval OPAM_ARCH := $(if $(filter x86-64,$(ARCH_RAW)),x86_64-linux,arm64-linux))
+	@echo 'Usage: make [x86-64 | arm64 | push-x86-64 | push-arm64]'
 
-	# We use -f to point to the Dockerfile because the context is now ".."
+x86-64:
 	docker build \
-		--platform $(PLATFORM) \
+		--platform linux/amd64 \
+		--build-context repo=.. \
 		--build-arg BASE_IMAGE=$(BASE_IMAGE) \
-		--build-arg MODE=$(MODE) \
-		-f Dockerfile \
-		-t $(REGISTRY)/$(IMAGE_NAME)-$(ARCH_RAW) \
-		..
-
-# Public targets
-stable-x86-64:
-	$(MAKE) build-x86-64 MODE=stable
-
-unstable-x86-64:
-	$(MAKE) build-x86-64 MODE=unstable
-
-stable-arm64:
-	$(MAKE) build-arm64 MODE=stable
+		-t $(REGISTRY)/docker-x86-64 .
 
-unstable-arm64:
-	$(MAKE) build-arm64 MODE=unstable
-
-# Push targets
-push-stable-x86-64: stable-x86-64
-	docker push $(REGISTRY)/debian-ocaml-$(OCAML_VER)-x86-64
-
-push-unstable-x86-64: unstable-x86-64
-	docker push $(REGISTRY)/debian-unstable-ocaml-$(OCAML_VER)-x86-64
+arm64:
+	docker build \
+		--platform linux/arm64 \
+		--build-context repo=.. \
+		--build-arg BASE_IMAGE=$(BASE_IMAGE) \
+		-t $(REGISTRY)/docker-arm64 .
 
-push-stable-arm64: stable-arm64
-	docker push $(REGISTRY)/debian-ocaml-$(OCAML_VER)-arm64
+push-x86-64: x86-64
+	docker push $(REGISTRY)/docker-x86-64
 
-push-unstable-arm64: unstable-arm64
-	docker push $(REGISTRY)/debian-unstable-ocaml-$(OCAML_VER)-arm64
+push-arm64: arm64
+	docker push $(REGISTRY)/docker-arm64
 
-.PHONY: stable-x86-64 unstable-x86-64 stable-arm64 unstable-arm64 \
-	push-stable-x86-64 push-unstable-x86-64 push-stable-arm64 push-unstable-arm64 \
-	default
+.PHONY: x86-64 arm64 push-x86-64 push-arm64 default