treshenkov/clearing
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge remote-tracking branch 'origin/master'

Browse source 
# Conflicts:
#	clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/security/WebSecurityConfig.java
This commit is contained in:
ialbert 2022-08-03 13:05:35 +03:00
commit 3ecca8986c
2 changed files with 2 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
clearing-parent/backend-api/Dockerfile
View file

@ -1,11 +0,0 @@
FROM fabric8/java-centos-openjdk11-jdk
ADD target/backend-api.jar /deployments/backend-api.jar
USER root
RUN mkdir ./logs
ENV JAVA_APP_JAR=backend-api.jar
#spring boot maven plugin
#RUN mkdir ./logs
#VOLUME . ./logs
#ARG JAR_FILE=target/backend-api.jar
#ENV JAVA_APP_JAR=backend-api.jar

4
z-distr/src/main/resources/distr/modules/os/Dockerfile
View file

@ -19,11 +19,11 @@ RUN apt install -y \
# Java # Java
############################################################################################################################################### ###############################################################################################################################################
ENV JAVA_VERSION jdk17.0.4+8 ENV JAVA_VERSION jdk17.0.2+9
RUN set -eux; \ RUN set -eux; \
ESUM='637a742591f75447eaab1f23942db038d411686f'; \ ESUM='637a742591f75447eaab1f23942db038d411686f'; \
BINARY_URL='https://download.bell-sw.com/java/17.0.4+8/bellsoft-jdk17.0.4+8-linux-amd64.tar.gz'; \ BINARY_URL='https://download.bell-sw.com/java/17.0.2+9/bellsoft-jdk17.0.2+9-linux-amd64.tar.gz'; \
curl -LfsSo /tmp/bellsoft-jdk.tar.gz ${BINARY_URL}; \ curl -LfsSo /tmp/bellsoft-jdk.tar.gz ${BINARY_URL}; \
mkdir -p /opt/java/bellsoft-jdk; \ mkdir -p /opt/java/bellsoft-jdk; \
cd /opt/java/bellsoft-jdk; \ cd /opt/java/bellsoft-jdk; \