From ad02d1da173b8bd1b14eceb51fade0233b984138 Mon Sep 17 00:00:00 2001 From: lwih Date: Fri, 29 Dec 2023 11:58:34 +0100 Subject: [PATCH] Trivy - fix docker file --- .github/workflows/release.yml | 4 ++-- infra/docker/app/DockerfileCI | 4 +--- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 4d8870cd..eebb817d 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -1,8 +1,8 @@ name: "Release" on: - push: - branches: [ "main" ] + # push: + # branches: [ "main" ] release: types: [ published ] diff --git a/infra/docker/app/DockerfileCI b/infra/docker/app/DockerfileCI index f0ee8245..bbec149f 100644 --- a/infra/docker/app/DockerfileCI +++ b/infra/docker/app/DockerfileCI @@ -13,7 +13,7 @@ ARG VERSION=NO_VERSION FROM maven:3.8.5-openjdk-17-slim as maven-dependencies WORKDIR /tmp/backend COPY backend/pom.xml pom.xml -RUN mvn dependency:go-offline -B -Dhttps.proxyHost=172.27.229.197 -Dhttps.proxyPort=8090 +RUN mvn dependency:go-offline -B # Stage 2: Build the application FROM maven:3.8.5-openjdk-17-slim as build-backend @@ -41,8 +41,6 @@ RUN mvn clean package -DskipTests=true -Dhttps.proxyHost=172.27.229.197 -Dhttps. FROM node:18 AS npm-dependencies WORKDIR /tmp/frontend COPY frontend/package.json frontend/package-lock.json ./ -RUN npm config set proxy http://172.27.229.197:8090 -RUN npm config set https-proxy http://172.27.229.197:8090 RUN npm ci # Stage 2: Build the application