From e60e3e88eee2e23fefab419202be04fc06a11e82 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Emil=20W=C3=A5reus?= <emil.wareus47@gmail.com>
Date: Mon, 30 Oct 2023 18:59:52 +0100
Subject: [PATCH] add debian to docker image resolve tests

---
 .github/workflows/test.yml                 | 17 ++++++++++++++---
 build/docker/alpine.Dockerfile             |  2 +-
 test/resolve/testdata/pip/requirements.txt |  8 --------
 3 files changed, 15 insertions(+), 12 deletions(-)

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 328a2999..054eb781 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -102,14 +102,25 @@ jobs:
   docker-resolve: 
     name: Docker E2E Resolve
     runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        docker-os: ['alpine', 'debian']
     steps:
       - uses: actions/checkout@v3
 
-      - name: Pull Image to cache from
-        run: docker pull debricked/cli:latest-resolution || true
+      # Pull from debian and re-tag to match cache
+      - name: Pull Image; Debian
+        if: ${{ matrix.docker-os == 'debian' }}
+        run: |
+          docker pull debricked/cli:latest-resolution-debian || true
+          docker tag debricked/cli:latest-resolution-debian debricked/cli:latest-resolution
 
+      - name: Pull Image; Alpine
+        if: ${{ matrix.docker-os == 'alpine' }}
+        run: docker pull debricked/cli:latest-resolution || true
+        
       - name: Build Docker image
-        run: docker build -f build/docker/alpine.Dockerfile -t debricked/cli:resolution-test --cache-from	debricked/cli:latest-resolution --target resolution .
+        run: docker build -f build/docker/${{ matrix.docker-os }}.Dockerfile -t debricked/cli:resolution-test --cache-from	debricked/cli:latest-resolution --target resolution .
 
       - name: Resolve with Docker
         run: docker run -v $(pwd):/root debricked/cli:resolution-test debricked resolve test/resolve
diff --git a/build/docker/alpine.Dockerfile b/build/docker/alpine.Dockerfile
index ac5d663b..5ba965e9 100644
--- a/build/docker/alpine.Dockerfile
+++ b/build/docker/alpine.Dockerfile
@@ -45,7 +45,7 @@ RUN apk --no-cache --update add \
   nodejs \
   yarn \
   dotnet7-sdk \
-  gcc
+  g++
 
 RUN dotnet --version
 
diff --git a/test/resolve/testdata/pip/requirements.txt b/test/resolve/testdata/pip/requirements.txt
index e575cb6e..e7d36f42 100644
--- a/test/resolve/testdata/pip/requirements.txt
+++ b/test/resolve/testdata/pip/requirements.txt
@@ -1,9 +1 @@
-pandas==1.5.1
 numpy==1.24.2
-pip==22.0.4
-python-dateutil==2.8.2
-pytz==2022.7.1
-setuptools==58.1.0
-six==1.16.0
-certifi==2023.7.22
-# comment