From 43d40a526b185960b25bd654c8afc8f5550fed0f Mon Sep 17 00:00:00 2001 From: simon lehericey Date: Tue, 24 Mar 2026 16:23:27 +0100 Subject: [PATCH 1/5] feat(version): --version now returns tags if available --- build.rs | 22 ++++++++++++++++++++-- 1 file changed, 20 insertions(+), 2 deletions(-) diff --git a/build.rs b/build.rs index 80e9cb2..fd6e30c 100644 --- a/build.rs +++ b/build.rs @@ -8,6 +8,24 @@ fn main() { .args(["rev-parse", "HEAD"]) .output() .unwrap(); - let git_hash = String::from_utf8(output.stdout).unwrap(); - println!("cargo:rustc-env=GIT_HASH={}", git_hash); + let git_hash = String::from_utf8(output.stdout).unwrap().trim().to_string(); + + let tag = Command::new("git") + .args(["describe", "--tags", "--exact-match", "HEAD"]) + .output() + .ok() + .and_then(|o| { + if o.status.success() { + Some(String::from_utf8(o.stdout).unwrap().trim().to_string()) + } else { + None + } + }); + + let version = match tag { + Some(t) => format!("{} {}", t, git_hash), + None => git_hash, + }; + + println!("cargo:rustc-env=GIT_HASH={}", version); } From 9a05a3790ad2362c7c1d4475c3c7a9a7d2800879 Mon Sep 17 00:00:00 2001 From: simon lehericey Date: Wed, 25 Mar 2026 16:13:13 +0100 Subject: [PATCH 2/5] chore(dockerfile): update the building of image from packaged version - add version ARG to specify the ds-proxy version - add ca-certificates to make ssl work - add apt-get autoremove to discard deps of curl gpg - move user creation at the beginning for caching - use ssl to fetch package.key --- Dockerfile_from_deb | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/Dockerfile_from_deb b/Dockerfile_from_deb index c87c476..6442571 100644 --- a/Dockerfile_from_deb +++ b/Dockerfile_from_deb @@ -1,13 +1,21 @@ FROM debian:13 USER root +# `-` is reserved by deb maintainer, should use '~' instead +# If no version is specified, the latest available version will be installed +ARG version + +RUN useradd --create-home --shell /bin/false ds_proxy + # Add DS/DN repo RUN apt-get update && apt-get -y install curl gpg \ - && curl -sS http://packages.demarches-simplifiees.fr/KEY.gpg | gpg --dearmor -o /usr/share/keyrings/demarches-simplifiees.gpg \ - && echo "deb [signed-by=/usr/share/keyrings/demarches-simplifiees.gpg] http://packages.demarches-simplifiees.fr/jammy /" > /etc/apt/sources.list.d/packages_demarches_simplifiees_fr_jammy.list \ - && apt-get update && apt-get -y install ds-proxy \ - && adduser --disabled-password --gecos "" ds_proxy \ + && curl -sS https://demarche.numerique.gouv.fr/packages.demarche.numerique.gouv.fr.gpg | gpg --dearmor -o /usr/share/keyrings/packages.demarche.numerique.gouv.fr.gpg \ + && echo "deb [signed-by=/usr/share/keyrings/packages.demarche.numerique.gouv.fr.gpg] http://packages.demarche.numerique.gouv.fr/jammy/ /" > /etc/apt/sources.list.d/packages_demarche_numerique_gouv_fr_jammy.list \ + && apt-get update \ + && apt-get -y install --no-install-recommends ca-certificates \ + && apt-get -y install ds-proxy${version:+=${version}} \ && apt-get remove --purge -y curl gpg \ + && apt-get autoremove -y \ && apt-get clean USER ds_proxy From ba9a71872475425f2e3d320ad73042de94ac0456 Mon Sep 17 00:00:00 2001 From: simon lehericey Date: Wed, 25 Mar 2026 09:33:29 +0100 Subject: [PATCH 3/5] chore(dockerfile): mv Dockerfile -> Dockerfile_from_sources --- Dockerfile => Dockerfile_from_sources | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename Dockerfile => Dockerfile_from_sources (100%) diff --git a/Dockerfile b/Dockerfile_from_sources similarity index 100% rename from Dockerfile rename to Dockerfile_from_sources From e0a50f1985576bcafc9258cf16e8e9ec9a9f6966 Mon Sep 17 00:00:00 2001 From: simon lehericey Date: Wed, 25 Mar 2026 09:34:00 +0100 Subject: [PATCH 4/5] chore(dockerfile): mv Dockerfile_from_deb -> Dockerfile --- Dockerfile_from_deb => Dockerfile | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename Dockerfile_from_deb => Dockerfile (100%) diff --git a/Dockerfile_from_deb b/Dockerfile similarity index 100% rename from Dockerfile_from_deb rename to Dockerfile From 62b43600e6f3f6e15fd1147d96067d8dd6689ce8 Mon Sep 17 00:00:00 2001 From: simon lehericey Date: Fri, 27 Mar 2026 10:25:28 +0100 Subject: [PATCH 5/5] chore(github-ci): check the docker image before merge --- .github/workflows/ci.yml | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 4ba9fc2..b827ec6 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -63,3 +63,12 @@ jobs: run: sudo sysctl vm.overcommit_memory=1 - run: cargo test --all-features + + docker: + name: docker build + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v6 + + - name: Build Docker image + run: docker build .