Refactored Docker files to eliminate redundant code and redundant definitions of Docker image versions.

danieltrick · danieltrick · commit bb4af465ce96 · 2026-06-23T16:26:45.000+02:00
diff --git a/.github/workflows/cargo-workflow.yaml b/.github/workflows/cargo-workflow.yaml
@@ -128,7 +128,7 @@ jobs:
     needs: [format, checks]
     strategy:
       matrix:
-        branch: ["stable", "unstable", "snapshot"]
+        branch: ["stable", "unstable", "bleeding-edge"]
     runs-on: ubuntu-${{ inputs.OS_VERS_MAX }}
     steps:
       - uses: actions/checkout@v7
@@ -137,7 +137,7 @@ jobs:
           toolchain: ${{ matrix.rust }}
           cache: false
       - run: |
-          make docker.tests TSSFAPI_TEST_BRANCH=${{ matrix.branch }}
+          make docker.tests RSTSS_BRANCH=${{ matrix.branch }}
 
   # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
   # Benchmarks
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -32,7 +32,7 @@ env_logger = "0.11.10"
 function_name = "0.3.0"
 hex = "0.4.3"
 memory-stats = "1.2.0"
-p256 = "=0.14.0-rc.12"
+p256 = "=0.14.0-rc.13"
 rand = "0.10.1"
 rand_chacha = "0.10.0"
 regex = "1.12.4"
diff --git a/tools/docker/build/Makefile b/tools/docker/build/Makefile
@@ -1,3 +1,5 @@
+include rstss.mk
+
 .PHONY: all run down
 
 all: down run
diff --git a/tools/docker/build/build.Dockerfile b/tools/docker/build/build.Dockerfile
diff --git a/tools/docker/build/docker-compose.yml b/tools/docker/build/docker-compose.yml
@@ -4,9 +4,9 @@ services:
   build:
     build:
       context: ./
-      dockerfile: build.Dockerfile
+      dockerfile: rstss.Dockerfile
       args:
-        BASE_VERSION: r29@sha256:c33d92b8bd58a5397cf6ca7af960a68658256209a3f05c7be89bd55fdf007b45
+        IMAGE_VERSION_RSTSS: ${IMAGE_VERSION_RSTSS:?}
     volumes:
       - ../../../:/var/opt/rust/src:ro
       - out:/var/tmp/rust:rw
diff --git a/tools/docker/build/rstss.Dockerfile b/tools/docker/build/rstss.Dockerfile
@@ -0,0 +1,8 @@
+# Define default Rust-TSS2 base image version
+ARG IMAGE_VERSION_RSTSS=UNDEFINED
+
+# Docker file for build-env
+FROM danieltrick/rust-tss2-docker@${IMAGE_VERSION_RSTSS}
+
+# Default command
+CMD ["rebuild", "--release"]
diff --git a/tools/docker/build/rstss.mk b/tools/docker/build/rstss.mk
@@ -0,0 +1,9 @@
+ifeq ($(filter-out stable,$(RSTSS_BRANCH)),)
+  export IMAGE_VERSION_RSTSS := sha256:c33d92b8bd58a5397cf6ca7af960a68658256209a3f05c7be89bd55fdf007b45
+else ifeq ($(RSTSS_BRANCH),unstable)
+  export IMAGE_VERSION_RSTSS := sha256:6e7f3de9c3b0298192a4db108d955cd203b360fd1fb40b5f6940c9e3ecf7cc0b
+else ifeq ($(RSTSS_BRANCH),bleeding-edge)
+  export IMAGE_VERSION_RSTSS := sha256:5e02daff85e7678c6715db7b9c07e96d3117bf04e8ec7eaba4a8958181035017
+else
+  $(error Unsupport RSTSS_BRANCH branch "$(RSTSS_BRANCH)" specified!)
+endif
diff --git a/tools/docker/swtpm/Makefile b/tools/docker/swtpm/Makefile
@@ -1,3 +1,5 @@
+include swtpm.mk
+
 .PHONY: all up down
 
 all: down up
diff --git a/tools/docker/swtpm/docker-compose.yml b/tools/docker/swtpm/docker-compose.yml
@@ -6,7 +6,7 @@ services:
       context: ./
       dockerfile: swtpm.Dockerfile
       args:
-        BASE_VERSION: r29@sha256:17fa49a22694ca52fa86c24f9907149d8bcf6d2d79909b5105410560104fb016
+        IMAGE_VERSION_SWTPM: ${IMAGE_VERSION_SWTPM:?}
     volumes:
       - log:/var/log/swtpm:rw
     tmpfs:
diff --git a/tools/docker/swtpm/swtpm.Dockerfile b/tools/docker/swtpm/swtpm.Dockerfile
@@ -1,8 +1,8 @@
-# Define default base image version
-ARG BASE_VERSION=UNDEFINED
+# Define default SWTPM base image version
+ARG IMAGE_VERSION_SWTPM=UNDEFINED
 
 # Docker file for SWTPM
-FROM danieltrick/swtpm-docker:${BASE_VERSION}
+FROM danieltrick/swtpm-docker@${IMAGE_VERSION_SWTPM}
 
 # Copy source files
 COPY src/entry-point.sh /opt/
diff --git a/tools/docker/swtpm/swtpm.mk b/tools/docker/swtpm/swtpm.mk
@@ -0,0 +1 @@
+export IMAGE_VERSION_SWTPM := sha256:17fa49a22694ca52fa86c24f9907149d8bcf6d2d79909b5105410560104fb016
diff --git a/tools/docker/tests/Makefile b/tools/docker/tests/Makefile
@@ -1,11 +1,12 @@
-TSSFAPI_TEST_BRANCH ?= stable
+include ../build/rstss.mk
+include ../swtpm/swtpm.mk
 
 .PHONY: all run down
 
 all: down run
 
 run:
-	docker compose -f docker-compose.$(TSSFAPI_TEST_BRANCH).yml run --build --rm tests
+	docker compose run --build --rm tests
 
 down:
-	docker compose -f docker-compose.$(TSSFAPI_TEST_BRANCH).yml down --remove-orphans
+	docker compose down --remove-orphans
diff --git a/tools/docker/tests/docker-compose.snapshot.yml b/tools/docker/tests/docker-compose.snapshot.yml
diff --git a/tools/docker/tests/docker-compose.unstable.yml b/tools/docker/tests/docker-compose.unstable.yml
diff --git a/tools/docker/tests/docker-compose.yml b/tools/docker/tests/docker-compose.yml
@@ -2,14 +2,16 @@ name: "tss2-fapi-rs-tests"
 
 services:
   tests:
-    networks:
-      tss2-fapi-rs-test-net:
-        ipv4_address: 10.0.0.10
+    depends_on:
+      - swtpm
     build:
       context: ./
       dockerfile: tests.Dockerfile
       args:
-        BASE_VERSION: r29@sha256:c33d92b8bd58a5397cf6ca7af960a68658256209a3f05c7be89bd55fdf007b45
+        IMAGE_VERSION_RSTSS: ${IMAGE_VERSION_RSTSS:?}
+    networks:
+      tss2-fapi-rs-test-net:
+        ipv4_address: 10.0.0.10
     volumes:
       - ../../../:/var/opt/rust/src:ro
       - log:/var/log/tss2-fapi-rs:rw
@@ -29,18 +31,16 @@ services:
     command:
       - "RSA2048SHA256"
       - "ECCP256SHA256"
-    depends_on:
-      - swtpm
 
   swtpm:
-    networks:
-      tss2-fapi-rs-test-net:
-        ipv4_address: 10.0.0.20
     build:
       context: ../swtpm
       dockerfile: swtpm.Dockerfile
       args:
-        BASE_VERSION: r29@sha256:17fa49a22694ca52fa86c24f9907149d8bcf6d2d79909b5105410560104fb016
+        IMAGE_VERSION_SWTPM: ${IMAGE_VERSION_SWTPM:?}
+    networks:
+      tss2-fapi-rs-test-net:
+        ipv4_address: 10.0.0.20
     volumes:
       - log:/var/log/swtpm:rw
     tmpfs:
diff --git a/tools/docker/tests/tests.Dockerfile b/tools/docker/tests/tests.Dockerfile
@@ -1,8 +1,8 @@
-# Define default base image version
-ARG BASE_VERSION=UNDEFINED
+# Define default Rust-TSS2 base image version
+ARG IMAGE_VERSION_RSTSS=UNDEFINED
 
 # Docker file for build-env
-FROM danieltrick/rust-tss2-docker:${BASE_VERSION}
+FROM danieltrick/rust-tss2-docker@${IMAGE_VERSION_RSTSS}
 
 # Copy source files
 COPY src/test-runner.sh src/shutdown_swtpm.c /opt/

Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,5 @@`
	`1`	`+include rstss.mk`
	`2`	`+`
`1`	`3`	`.PHONY: all run down`
`2`	`4`
`3`	`5`	`all: down run`
Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,5 @@`
	`1`	`+include swtpm.mk`
	`2`	`+`
`1`	`3`	`.PHONY: all up down`
`2`	`4`
`3`	`5`	`all: down up`