From d9532aa17a6242ccfa678faf13275ab047219def Mon Sep 17 00:00:00 2001
From: Paul Campbell <campbjpa@amazon.com>
Date: Tue, 17 Sep 2024 08:34:04 +0100
Subject: [PATCH] build: be more flexible in apt-get versions for docker image

Also merges as we can't build without both in place:

fix(build): revert invalid matrix syntax

Back out "test: verify matrix with stable and nightly"

This backs out commit 5fc345c0de89efd12d80a3b4af3036f2da44eeb4.
---
 .forgejo/workflows/test.yml | 18 ++++++------------
 Dockerfile                  |  9 +--------
 2 files changed, 7 insertions(+), 20 deletions(-)

diff --git a/.forgejo/workflows/test.yml b/.forgejo/workflows/test.yml
index 956657a..5434bd4 100644
--- a/.forgejo/workflows/test.yml
+++ b/.forgejo/workflows/test.yml
@@ -5,26 +5,20 @@ on:
 jobs:
   test:
     runs-on: docker
-    strategy:
-      matrix:
-        toolchain:
-          - stable
-          - nightly
-
     steps:
       - uses: actions/checkout@v4
 
-      - name: Test ${{ toolchain}}
+      - name: Test
         uses: https://git.kemitix.net/kemitix/rust@next
         with:
-          args: ${{toolchain}} cargo test
+          args: cargo test
 
-      - name: Build ${{ toolchain }}
+      - name: Build
         uses: https://git.kemitix.net/kemitix/rust@next
         with:
-          args: ${{ toolchain }} cargo build
+          args: cargo build
 
-      - name: Run ${{ toolchain }}
+      - name: Run
         uses: https://git.kemitix.net/kemitix/rust@next
         with:
-          args: ${{ toolchain }} cargo run
+          args: cargo run
diff --git a/Dockerfile b/Dockerfile
index 914accc..0eae36e 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -9,14 +9,7 @@ FROM docker.io/rust:1.81.0-slim-bookworm
 # git - git
 RUN apt-get update \
   && \
-  apt-get install -y \
-  --no-install-recommends \
-  nodejs=18.19.0+dfsg-6~deb12u2 \
-  curl=7.88.1-10+deb12u7 \
-  pkg-config=1.8.1-1 \
-  libssl-dev=3.0.14-1~deb12u2 \
-  libdbus-1-dev=1.14.10-1~deb12u1 \
-  git=1:2.39.2-1.1 \
+  apt-get satisfy -y "nodejs (>=18.19.0) curl (>=7.88.1) pkg-config (>=1.8.1) libssl-dev (>=3.0.14) git (>=2.39.2)" \
   && \
   rm -r /var/lib/apt/lists/*