Skip to content

Commit

Permalink
Test debian image
Browse files Browse the repository at this point in the history
  • Loading branch information
ProgHaj committed Sep 21, 2023
1 parent 3f1827f commit d2e41c8
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 30 deletions.
8 changes: 4 additions & 4 deletions .github/workflows/docker.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ name: Docker
on:
push:
branches:
- main
- fix-debian-image
tags:
- 'v*'

Expand All @@ -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
Expand Down Expand Up @@ -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 }}
26 changes: 0 additions & 26 deletions build/docker/debian.Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit d2e41c8

Please sign in to comment.