Merge pull request #33 from jdrouet/refactor-debian-image

mutualize dockerfiles for all debian versions
rust-lang · Jan 26, 2022 · 3a50bf3 · 3a50bf3
2 parents bae0446 + a1d0530
commit 3a50bf3
Show file tree

Hide file tree

Showing 5 changed files with 19 additions and 67 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -26,17 +26,25 @@ jobs:
               ALPINE_VERSION=3.14
             tags: |
               nightly-alpine3.14
-          - context: bullseye
+          - context: debian
+            args: |
+              DEBIAN_VERSION=bullseye
             tags: |
               nightly-bullseye
-          - context: bullseye/slim
+          - context: debian
+            args: |
+              DEBIAN_VERSION=buster
             tags: |
-              nightly-bullseye-slim
-          - context: buster
+              nightly
+              nightly-buster
+          - context: debian-slim
+            args: |
+              DEBIAN_VERSION=bullseye
             tags: |
-              value=nightly
-              value=nightly-buster
-          - context: buster/slim
+              nightly-bullseye-slim
+          - context: debian-slim
+            args: |
+              DEBIAN_VERSION=buster
             tags: |
               nightly-slim
               nightly-buster-slim

diff --git a/buster/Dockerfile b/buster/Dockerfile
diff --git a/buster/slim/Dockerfile b/buster/slim/Dockerfile
diff --git a/bullseye/slim/Dockerfile → debian-slim/Dockerfile b/bullseye/slim/Dockerfile → debian-slim/Dockerfile
@@ -1,4 +1,5 @@
-FROM debian:bullseye-slim
+ARG DEBIAN_VERSION
+FROM debian:${DEBIAN_VERSION}-slim
 
 ENV RUSTUP_HOME=/usr/local/rustup \
     CARGO_HOME=/usr/local/cargo \

diff --git a/bullseye/Dockerfile → debian/Dockerfile b/bullseye/Dockerfile → debian/Dockerfile
@@ -1,4 +1,5 @@
-FROM buildpack-deps:bullseye
+ARG DEBIAN_VERSION
+FROM buildpack-deps:${DEBIAN_VERSION}
 
 ENV RUSTUP_HOME=/usr/local/rustup \
     CARGO_HOME=/usr/local/cargo \