diff --git a/clearing-parent/backend-api/Dockerfile b/clearing-parent/backend-api/Dockerfile deleted file mode 100644 index 03e8ad5fd..000000000 --- a/clearing-parent/backend-api/Dockerfile +++ /dev/null @@ -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 \ No newline at end of file diff --git a/clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/security/WebSecurityConfig.java b/clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/security/WebSecurityConfig.java index 3726994ea..0444d88ad 100644 --- a/clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/security/WebSecurityConfig.java +++ b/clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/security/WebSecurityConfig.java @@ -1,12 +1,9 @@ package ru.spcex.clearing.backendapi.security; -import org.keycloak.adapters.KeycloakConfigResolver; import org.keycloak.adapters.springsecurity.KeycloakConfiguration; import org.keycloak.adapters.springsecurity.authentication.KeycloakAuthenticationProvider; import org.keycloak.adapters.springsecurity.config.KeycloakWebSecurityConfigurerAdapter; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.context.annotation.Bean; -import org.springframework.context.annotation.Primary; import org.springframework.security.config.annotation.authentication.builders.AuthenticationManagerBuilder; import org.springframework.security.config.annotation.method.configuration.EnableGlobalMethodSecurity; import org.springframework.security.config.annotation.web.builders.HttpSecurity; @@ -30,15 +27,15 @@ public class WebSecurityConfig extends KeycloakWebSecurityConfigurerAdapter { authManagerBuilder.authenticationProvider(keycloakAuthenticationProvider); } - /** - * чтобы переместить настройки keycloak в keycloak.json вместо application.properties - * если будут проблемы, реализовать {@link KeycloakConfigResolver} считывая JSON из keycloak.json - */ - @Primary - @Bean - public KeycloakConfigResolver keycloakConfigResolver() { - return null; - } +// /** +// * чтобы переместить настройки keycloak в keycloak.json вместо application.properties +// * если будут проблемы, реализовать {@link KeycloakConfigResolver} считывая JSON из keycloak.json +// */ +// @Primary +// @Bean +// public KeycloakConfigResolver keycloakConfigResolver() { +// return null; +// } @Override protected void configure(HttpSecurity http) throws Exception { diff --git a/z-distr/src/main/resources/distr/modules/os/Dockerfile b/z-distr/src/main/resources/distr/modules/os/Dockerfile index aaf05c3d9..ebe0672f2 100644 --- a/z-distr/src/main/resources/distr/modules/os/Dockerfile +++ b/z-distr/src/main/resources/distr/modules/os/Dockerfile @@ -19,11 +19,11 @@ RUN apt install -y \ # Java ############################################################################################################################################### -ENV JAVA_VERSION jdk17.0.4+8 +ENV JAVA_VERSION jdk17.0.2+9 RUN set -eux; \ 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}; \ mkdir -p /opt/java/bellsoft-jdk; \ cd /opt/java/bellsoft-jdk; \