From 74239e2eac2b358d2af6a1c7d4d490548c9db643 Mon Sep 17 00:00:00 2001 From: Edouard DUPIN Date: Tue, 31 May 2022 23:29:51 +0200 Subject: [PATCH] [DEV] change back --- Dockerfile | 24 +++++++++++++++++------- docker-compose.yaml | 2 +- 2 files changed, 18 insertions(+), 8 deletions(-) diff --git a/Dockerfile b/Dockerfile index f1b95d8..9894f2a 100644 --- a/Dockerfile +++ b/Dockerfile @@ -16,8 +16,8 @@ RUN pacman -S --noconfirm jdk-openjdk java-openjfx RUN pacman -S --noconfirm maven gradle # intall npm RUN pacman -S --noconfirm npm -# clean all the caches -RUN pacman -Scc --noconfirm +# clean all the caches Need only on the release environment +# RUN pacman -Scc --noconfirm ENV PATH_ROOT $PATH @@ -54,7 +54,7 @@ ADD front/angular.json /tmp/front/ ADD front/src /tmp/front/src # generate build -RUN ng build --output-path=dist --configuration=production --base-href=/karso/ --deploy-url=/karso/ +RUN ng build --output-path=dist --configuration=production --base-href=/karauth/ --deploy-url=/karauth/ ###################################################################################### ## ## Build sso: @@ -86,11 +86,21 @@ RUN ng build --output-path=dist --configuration=production --base-href=/karso/ - ## ###################################################################################### -FROM bellsoft/liberica-openjdk-alpine:latest -ENV LANG=C.UTF-8 - +#FROM bellsoft/liberica-openjdk-alpine:latest # add wget to manage the health check... -RUN apk add --no-cache wget +#RUN apk add --no-cache wget + +FROM archlinux:base +RUN pacman -Syu --noconfirm && pacman-db-upgrade +# install package +RUN pacman -S --noconfirm jdk-openjdk wget +# intall npm +RUN pacman -S --noconfirm npm +# clean all the caches Need only on the release environment +RUN pacman -Scc --noconfirm + + +ENV LANG=C.UTF-8 RUN mkdir /application/ #copy REST API from back: diff --git a/docker-compose.yaml b/docker-compose.yaml index b1383d6..cd50a2a 100644 --- a/docker-compose.yaml +++ b/docker-compose.yaml @@ -33,7 +33,7 @@ services: karauth_back_service: build: . restart: always - image: org.kar.auth.back + image: org.kar.auth depends_on: - karauth_db_service ports: