From d2e41c8b7ae822c9b9e203abe8d7bc619cf7a95a Mon Sep 17 00:00:00 2001
From: ProgHaj <flummeltrollet@gmail.com>
Date: Thu, 21 Sep 2023 16:15:43 +0200
Subject: [PATCH] Test debian image

---
 .github/workflows/docker.yml   |  8 ++++----
 build/docker/debian.Dockerfile | 26 --------------------------
 2 files changed, 4 insertions(+), 30 deletions(-)

diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml
index d30cb146..d58cf055 100644
--- a/.github/workflows/docker.yml
+++ b/.github/workflows/docker.yml
@@ -3,7 +3,7 @@ name: Docker
 on:
   push:
     branches:
-      - main
+      - fix-debian-image
     tags:
       - 'v*'
 
@@ -12,8 +12,8 @@ jobs:
     name: 'Push Docker images'
     strategy:
       matrix:
-        stage: ['cli', 'scan', 'resolution']
-        docker-os: ['alpine', 'debian']
+        stage: ['resolution']
+        docker-os: ['debian']
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
@@ -67,6 +67,6 @@ jobs:
           file: build/docker/${{ matrix.docker-os }}.Dockerfile
           target: ${{ matrix.stage }}
           platforms: linux/amd64,linux/arm64
-          push: ${{ github.event_name != 'pull_request' }}
+          push: false
           tags: ${{ steps.meta.outputs.tags }}
           labels: ${{ steps.meta.outputs.labels }}
diff --git a/build/docker/debian.Dockerfile b/build/docker/debian.Dockerfile
index 18f6d715..903c18bd 100644
--- a/build/docker/debian.Dockerfile
+++ b/build/docker/debian.Dockerfile
@@ -37,32 +37,6 @@ RUN apt -y update && apt -y upgrade && apt -y install openjdk-11-jre \
     apt -y install -t testing golang-1.20 && \
     apt -y clean && rm -rf /var/lib/apt/lists/*
 
-RUN mkdir -p /etc/apt/keyrings
-
-ENV MAVEN_VERSION 3.9.2
-ENV MAVEN_HOME /usr/lib/mvn
-ENV PATH $MAVEN_HOME/bin:$PATH
-RUN wget http://archive.apache.org/dist/maven/maven-3/$MAVEN_VERSION/binaries/apache-maven-$MAVEN_VERSION-bin.tar.gz && \
-    tar -zxvf apache-maven-$MAVEN_VERSION-bin.tar.gz && \
-    rm apache-maven-$MAVEN_VERSION-bin.tar.gz && \
-    mv apache-maven-$MAVEN_VERSION $MAVEN_HOME
-
-ENV GRADLE_VERSION 8.1.1
-ENV GRADLE_HOME /usr/lib/gradle
-ENV PATH $GRADLE_HOME/gradle-$GRADLE_VERSION/bin:$PATH
-RUN wget https://services.gradle.org/distributions/gradle-$GRADLE_VERSION-bin.zip && \
-    unzip gradle-$GRADLE_VERSION-bin.zip -d $GRADLE_HOME && \
-    rm gradle-$GRADLE_VERSION-bin.zip
-
-
-ENV NODE_MAJOR 18
-RUN curl -fsSL https://deb.nodesource.com/gpgkey/nodesource-repo.gpg.key | gpg --dearmor -o /etc/apt/keyrings/nodesource.gpg
-RUN echo "deb [signed-by=/etc/apt/keyrings/nodesource.gpg] https://deb.nodesource.com/node_$NODE_MAJOR.x nodistro main" | tee /etc/apt/sources.list.d/nodesource.list
-RUN apt -y update && apt -y upgrade && apt -y install nodejs && \
-    apt -y clean && rm -rf /var/lib/apt/lists/*
-RUN npm install -g npm@latest
-RUN npm install --global yarn
-
 
 RUN wget https://packages.microsoft.com/config/debian/11/packages-microsoft-prod.deb -O packages-microsoft-prod.deb && dpkg -i packages-microsoft-prod.deb
 RUN rm packages-microsoft-prod.deb