From f92c561ca4f4a13a24636005313b9979dbab6556 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fran=C3=A7ois=20Dupressoir?= <fdupress@gmail.com>
Date: Fri, 28 Nov 2025 16:39:57 +0000
Subject: [PATCH 1/2] prepare for docker builds in CI

---
 .github/workflows/docker.yml | 41 ++++++++++++++++++++++++++++++++++++
 scripts/docker/Makefile      |  5 +++--
 2 files changed, 44 insertions(+), 2 deletions(-)
 create mode 100644 .github/workflows/docker.yml

diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml
new file mode 100644
index 0000000000..488767da5e
--- /dev/null
+++ b/.github/workflows/docker.yml
@@ -0,0 +1,41 @@
+name: EasyCrypt Docker Containers Build
+
+on:
+  push:
+    branches:
+      - 'stable'
+      - 'testing'
+    tags:
+      - 'r[0-9]+.[0-9]+'
+  workflow_dispatch:
+
+jobs:
+  make-images:
+    name: Build and Push Container Images
+    runs-on: ubuntu-24.04
+    permissions:
+      packages: write
+    steps:
+    - uses: actions/checkout@v4
+
+    - name: Build `base` Image
+      run: TAG=${{ github.ref_name }} VARIANT=base make -C scripts/docker
+
+    - name: Build `build` Image
+      run: TAG=${{ github.ref_name }} VARIANT=build make -C scripts/docker
+
+    - name: Build `formosa` Image
+      run: TAG=${{ github.ref_name }} VARIANT=formosa make -C scripts/docker
+
+    - name: Log in to the Container registry
+      uses: docker/login-action@65b78e6e13532edd9afa3aa52ac7964289d1a9c1
+      with:
+        registry: https://ghcr.io
+        username: ${{ github.actor }}
+        password: ${{ secrets.GITHUB_TOKEN }}
+
+    - name: Push All Images
+      run: |
+        TAG=${{ github.ref_name }} VARIANT=base make -C scripts/docker publish
+        TAG=${{ github.ref_name }} VARIANT=build make -C scripts/docker publish
+        TAG=${{ github.ref_name }} VARIANT=formosa make -C scripts/docker publish
diff --git a/scripts/docker/Makefile b/scripts/docker/Makefile
index f8551c2f94..0400237023 100644
--- a/scripts/docker/Makefile
+++ b/scripts/docker/Makefile
@@ -2,6 +2,7 @@
 
 # --------------------------------------------------------------------
 VARIANT ?= build
+TAG     ?= main
 
 # --------------------------------------------------------------------
 .PHONY: default build publish
@@ -11,8 +12,8 @@ default: build
 build:
 	docker build -f Dockerfile.$(VARIANT) \
 	  --platform linux/amd64 \
-	  -t ghcr.io/easycrypt/ec-$(VARIANT)-box \
+	  -t ghcr.io/easycrypt/ec-$(VARIANT)-box:$(TAG) \
 	  .
 
 publish:
-	docker push ghcr.io/easycrypt/ec-$(VARIANT)-box
+	docker push ghcr.io/easycrypt/ec-$(VARIANT)-box:$(TAG)

From b219d50275e83427b1bac5f1348f512de3c2ae8d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fran=C3=A7ois=20Dupressoir?= <fdupress@gmail.com>
Date: Tue, 2 Dec 2025 11:52:16 +0000
Subject: [PATCH 2/2] REVERT ME

---
 .github/workflows/docker.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml
index 488767da5e..c3b9779d95 100644
--- a/.github/workflows/docker.yml
+++ b/.github/workflows/docker.yml
@@ -5,6 +5,7 @@ on:
     branches:
       - 'stable'
       - 'testing'
+      - 'docker-builds-in-ci'
     tags:
       - 'r[0-9]+.[0-9]+'
   workflow_dispatch: