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

up spring version

Browse source
This commit is contained in:
etreschenkov 2022-08-03 12:12:02 +03:00
parent d5add01b2b
commit 8b2fae57c2
3 changed files with 11 additions and 25 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

21
clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/security/WebSecurityConfig.java
View file

@ -1,12 +1,9 @@
package ru.spcex.clearing.backendapi.security; package ru.spcex.clearing.backendapi.security;
import org.keycloak.adapters.KeycloakConfigResolver;
import org.keycloak.adapters.springsecurity.KeycloakConfiguration; import org.keycloak.adapters.springsecurity.KeycloakConfiguration;
import org.keycloak.adapters.springsecurity.authentication.KeycloakAuthenticationProvider; import org.keycloak.adapters.springsecurity.authentication.KeycloakAuthenticationProvider;
import org.keycloak.adapters.springsecurity.config.KeycloakWebSecurityConfigurerAdapter; import org.keycloak.adapters.springsecurity.config.KeycloakWebSecurityConfigurerAdapter;
import org.springframework.beans.factory.annotation.Autowired; 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.authentication.builders.AuthenticationManagerBuilder;
import org.springframework.security.config.annotation.method.configuration.EnableGlobalMethodSecurity; import org.springframework.security.config.annotation.method.configuration.EnableGlobalMethodSecurity;
import org.springframework.security.config.annotation.web.builders.HttpSecurity; import org.springframework.security.config.annotation.web.builders.HttpSecurity;
@ -30,15 +27,15 @@ public class WebSecurityConfig extends KeycloakWebSecurityConfigurerAdapter {
authManagerBuilder.authenticationProvider(keycloakAuthenticationProvider); authManagerBuilder.authenticationProvider(keycloakAuthenticationProvider);
} }
/** // /**
* чтобы переместить настройки keycloak в keycloak.json вместо application.properties // * чтобы переместить настройки keycloak в keycloak.json вместо application.properties
* если будут проблемы, реализовать {@link KeycloakConfigResolver} считывая JSON из keycloak.json // * если будут проблемы, реализовать {@link KeycloakConfigResolver} считывая JSON из keycloak.json
*/ // */
@Primary // @Primary
@Bean // @Bean
public KeycloakConfigResolver keycloakConfigResolver() { // public KeycloakConfigResolver keycloakConfigResolver() {
return null; // return null;
} // }
@Override @Override
protected void configure(HttpSecurity http) throws Exception { protected void configure(HttpSecurity http) throws Exception {

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; \