fix containers

logsem · Aug 27, 2024 · a19ae81 · a19ae81
1 parent e99c00c
commit a19ae81
Show file tree

Hide file tree

Showing 5 changed files with 47 additions and 17 deletions.
diff --git a/.devcontainer/devcontainer.json → .devcontainer/arm64/devcontainer.json b/.devcontainer/devcontainer.json → .devcontainer/arm64/devcontainer.json
@@ -1,6 +1,6 @@
 {
-	"name": "iris-tutorial container",
-	"image": "ghcr.io/logsem/iris-tutorial",
+	"name": "iris-tutorial arm64 container",
+	"image": "ghcr.io/logsem/iris-tutorial/docker-arm64",
 	"customizations": {
 		"vscode": {
 		  "extensions": ["maximedenes.vscoq"]

diff --git a/.devcontainer/x86-64/devcontainer.json b/.devcontainer/x86-64/devcontainer.json
@@ -0,0 +1,18 @@
+{
+	"name": "iris-tutorial x86-64 container",
+	"image": "ghcr.io/logsem/iris-tutorial/docker-x86-64",
+	"customizations": {
+		"vscode": {
+		  "extensions": ["maximedenes.vscoq"]
+		},
+		"settings": {
+			"terminal.integrated.profiles.linux": {
+				"bash": {
+					"path": "bash",
+					"icon": "terminal-bash"
+				}
+			},
+			"terminal.integrated.defaultProfile.linux": "bash"
+		}
+	}
+}
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -11,11 +11,9 @@ on:
 jobs:
   build:
     runs-on: ubuntu-latest
-    container: ghcr.io/logsem/iris-tutorial
+    container: ghcr.io/logsem/iris-tutorial/docker-x86-64
 
     steps:
-      - uses: actions/checkout@v3
-      - name: install-gawk
-        run: apt install gawk -y
+      - uses: actions/checkout@v4
       - name: make-ci
         run: make ci -j2
diff --git a/docker_image/Dockerfile b/docker_image/Dockerfile
@@ -1,8 +1,11 @@
 FROM debian:bookworm
 
-RUN apt-get update && apt-get -y upgrade && apt-get -y install make gcc patch git unzip bubblewrap curl libgmp-dev bzip2
+RUN apt-get -y update
+RUN apt-get -y upgrade
+RUN apt-get -y install make gcc patch git unzip bubblewrap curl libgmp-dev bzip2 pkg-config gawk
 
-ARG OPAMYES=true OPAMROOTISOK=true
+ARG OPAMYES=true
+ENV OPAMROOTISOK=true
 
 RUN curl -sL https://github.com/ocaml/opam/releases/download/2.2.1/opam-2.2.1-x86_64-linux -o opam
 RUN install opam /usr/local/bin/opam
@@ -16,15 +19,17 @@ RUN opam repo add --set-default iris-dev https://gitlab.mpi-sws.org/iris/opam.gi
 RUN opam switch create stable ocaml.5.2.0
 RUN eval $(opam env)
 RUN opam update
-RUN opam install coq.8.19.2 coq-iris.4.2.0 coq-iris-heap-lang vscoq-language-server
+RUN opam install coq.8.19.2 vscoq-language-server
+RUN opam install coq-iris.4.2.0 coq-iris-heap-lang
 
 RUN opam switch create unstable ocaml.5.2.0
 RUN eval $(opam env)
 RUN opam update
-RUN opam install coq.8.19.2 coq-iris coq-iris-heap-lang coq-iris-unstable vscoq-language-server
+RUN opam install coq.8.19.2 vscoq-language-server
+RUN opam install coq-iris coq-iris-heap-lang coq-iris-unstable
 
 RUN opam switch stable
-RUN opam update
 RUN eval $(opam env)
+RUN opam update
 
-RUN echo 'eval $(opam env)' >> ~/.bashrc
+RUN echo 'eval $(opam env)' >> ~/.bashrc
diff --git a/docker_image/Makefile b/docker_image/Makefile
@@ -1,7 +1,16 @@
-all:
-	docker build -t ghcr.io/logsem/iris-tutorial .
+default:
+	@echo 'Please use one of the following targets: x86-64, push-x86-64, arm64, or push-arm64.'
 
-push:
-	docker push ghcr.io/logsem/iris-tutorial
+x86-64:
+	docker build --platform linux/amd64 -t ghcr.io/logsem/iris-tutorial/docker-x86-64 .
 
-.phony: all push
+arm64:
+	docker build --platform linux/arm64 -t ghcr.io/logsem/iris-tutorial/docker-arm64 .
+
+push-x86-64: x86-64
+	docker push ghcr.io/logsem/iris-tutorial/docker-x86-64
+
+push-arm64: arm64
+	docker push ghcr.io/logsem/iris-tutorial/docker-arm64
+
+.phony: x86-64 push-x86-64 arm64 push-arm64 default