[DEBUG] correct the interface docker

This commit is contained in:
Edouard DUPIN 2022-05-30 22:25:21 +02:00
parent 71f8c0d548
commit a757a580eb
8 changed files with 54431 additions and 24 deletions

2
.gitignore vendored
View File

@ -14,8 +14,6 @@ config.env
dataPush
node_modules
package-lock.json
# IDEs and editors
/.idea
.project

View File

@ -1,4 +1,4 @@
FROM maven:3.6.3-openjdk-16 AS build
FROM maven:3-openjdk-18 AS build
COPY pom.xml /tmp/
COPY src /tmp/src/

View File

@ -3,7 +3,7 @@ package org.kar.oauth.util;
public class ConfigVariable {
public static String getDBHost() {
String out = System.getenv("org.kar.oauth.db.host");
String out = System.getenv("ORG_KARAUTH_DB_HOST");
if (out == null) {
return "localhost";
}
@ -11,7 +11,7 @@ public class ConfigVariable {
}
public static String getDBPort() {
String out = System.getenv("org.kar.oauth.db.port");
String out = System.getenv("ORG_KARAUTH_DB_PORT");
if (out == null) {
//return"3306";
return "17036";
@ -20,7 +20,7 @@ public class ConfigVariable {
}
public static String getDBLogin() {
String out = System.getenv("org.kar.oauth.db.login");
String out = System.getenv("ORG_KARAUTH_DB_LOGIN");
if (out == null) {
return "root";
}
@ -44,7 +44,7 @@ public class ConfigVariable {
}
public static String getlocalAddress() {
String out = System.getenv("org.kar.oauth.address");
String out = System.getenv("ORG_KARAUTH_DB_ADDRESS");
if (out == null) {
return "http://0.0.0.0:17080/karauth/api/";
}
@ -52,7 +52,7 @@ public class ConfigVariable {
}
/*
public static String getSecretOfTheGod() {
String out = System.getenv("org.kar.oauth.secretOfTheGod");
String out = System.getenv("ORG_KARAUTH_DB_SECRET");
if (out == null) {
System.out.println("missing Secret !!!!");
return null;

View File

@ -21,8 +21,8 @@ services:
image: adminer:latest
restart: always
depends_on:
- karauth_db_service:
condition: service_healthy
- karauth_db_service
# # condition: service_healthy
ports:
- 17079:8080
links:
@ -33,7 +33,7 @@ services:
karauth_back_service:
build: back/
restart: always
image: org.kar.oauth
image: org.kar.auth.back
depends_on:
- karauth_db_service
ports:

27200
front/package-lock.json generated Normal file

File diff suppressed because it is too large Load Diff

View File

@ -6,11 +6,14 @@
export const environment = {
production: true,
// URL of development API
applName: "karso",
apiUrl: 'http://192.168.1.156/karideo/api',
apiOAuthUrl: 'http://192.168.1.156/karauth/api',
frontBaseUrl: 'karauth',
apiMode: 'QUERRY',
// apiMode: "REWRITE",
localBdd: true
applName: "karauth",
defaultServer: "karauth",
server: {
karauth: 'http://192.168.1.156/karauth/api',
},
ssoSignIn: 'http://192.168.1.156/karauth/signin/karauth-dev/',
ssoSignUp: 'http://192.168.1.156/karauth/signup/karauth-dev/',
ssoSignOut: 'http://192.168.1.156/karauth/signout/karauth-dev/',
frontBaseUrl: '',
apiMode: 'REWRITE'
};

27206
sso/package-lock.json generated Normal file

File diff suppressed because it is too large Load Diff

View File

@ -7,10 +7,10 @@ export const environment = {
production: true,
// URL of development API
applName: "karso",
apiUrl: 'http://192.168.1.156/karideo/api',
apiOAuthUrl: 'http://192.168.1.156/karauth/api',
frontBaseUrl: 'karso',
apiMode: 'QUERRY',
// apiMode: "REWRITE",
localBdd: true
defaultServer: "karauth",
server: {
karauth: 'http://192.168.1.156/karauth/api',
},
frontBaseUrl: '',
apiMode: 'REWRITE'
};