Skip to content

Commit 93eabfe

Browse files
4drianMatei4drianMatei
committed
Merge branch 'refactor/update-keycloak'
2 parents f13d924 + e4cdce7 commit 93eabfe

35 files changed

+2822
-1280
lines changed

‎.gitignore

+3
Original file line numberDiff line numberDiff line change
@@ -2,3 +2,6 @@
22
/node_modules/
33
/frontend/src/environments/version.ts
44
dist.zip
5+
keycloak-theme/keycloak-original-themes/*
6+
documentation/keycloak-upgrade/*
7+
/documentation/keycloak-upgrade/

‎backend/.nvmrc

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
10.15.0
1+
16.18.1

‎backend/package-lock.json

+281-767
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎backend/package.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
"fs-extra": "^7.0.1",
2020
"helmet": "^3.23.3",
2121
"http-status-codes": "^1.4.0",
22-
"keycloak-connect": "6.0.1",
22+
"keycloak-connect": "12.0.4",
2323
"mongoose": "^5.13.14",
2424
"morgan": "^1.10.0",
2525
"multer": "^1.4.4",
@@ -39,7 +39,7 @@
3939
"eslint": "^8.5.0",
4040
"jsonwebtoken": "^8.5.1",
4141
"mocha": "^9.1.3",
42-
"nodemon": "^2.0.15",
42+
"nodemon": "^2.0.20",
4343
"nyc": "^15.1.0",
4444
"supertest": "^3.4.2"
4545
}

‎docker-compose-mysql.yml

+61
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,61 @@
1+
version: '3.7'
2+
3+
volumes:
4+
mysql_data:
5+
driver: local
6+
mongo_data:
7+
notused:
8+
9+
networks:
10+
backend:
11+
12+
services:
13+
mysql:
14+
container_name: codever-mysql
15+
image: mysql:5.7
16+
networks:
17+
- backend
18+
volumes:
19+
- mysql_data:/var/lib/mysql
20+
environment:
21+
MYSQL_ROOT_PASSWORD: root
22+
MYSQL_DATABASE: keycloak
23+
MYSQL_USER: keycloak
24+
MYSQL_PASSWORD: password
25+
keycloak:
26+
container_name: codever-keycloak
27+
image: jboss/keycloak:12.0.4
28+
networks:
29+
- backend
30+
environment:
31+
DB_VENDOR: MYSQL
32+
DB_ADDR: mysql
33+
DB_DATABASE: keycloak
34+
DB_USER: keycloak
35+
DB_SCHEMA: public
36+
DB_PASSWORD: password
37+
KEYCLOAK_USER: admin
38+
KEYCLOAK_PASSWORD: Pa55w0rd
39+
ports:
40+
- 8480:8080
41+
depends_on:
42+
- mysql
43+
#command: -Dkeycloak.migration.action=export -Dkeycloak.migration.provider=dir -Dkeycloak.migration.dir=/tmp/keycloak/export-import
44+
command: -Dkeycloak.migration.action=import -Dkeycloak.migration.provider=dir -Dkeycloak.migration.dir=/tmp/keycloak/export-import -Dkeycloak.migration.strategy=IGNORE_EXISTING
45+
volumes:
46+
- ./docker-compose-setup/keycloak-export-import:/tmp/keycloak/export-import/
47+
- ./keycloak-theme/codever/:/opt/jboss/keycloak/themes/codever/
48+
mongo:
49+
image: mongo:3.4
50+
container_name: codever-mongo
51+
networks:
52+
- backend
53+
environment:
54+
- MONGO_INITDB_DATABASE=dev-bookmarks
55+
- MONGO_INITDB_ROOT_USERNAME=mongoadmin
56+
- MONGO_INITDB_ROOT_PASSWORD=secret
57+
ports:
58+
- 27017:27017
59+
volumes:
60+
- ./docker-compose-setup/init-mongo.js:/docker-entrypoint-initdb.d/init-mongo.js:ro
61+
- mongo_data:/data/db

‎docker-compose-postgres.yml

+59
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,59 @@
1+
version: '3.7'
2+
3+
volumes:
4+
postgres_data:
5+
driver: local
6+
mongo_data:
7+
notused:
8+
9+
networks:
10+
backend:
11+
12+
services:
13+
postgres:
14+
container_name: codever-postgres
15+
image: postgres
16+
networks:
17+
- backend
18+
volumes:
19+
- postgres_data:/var/lib/postgresql/data
20+
environment:
21+
POSTGRES_DB: keycloak
22+
POSTGRES_USER: keycloak
23+
POSTGRES_PASSWORD: password
24+
keycloak:
25+
container_name: codever-keycloak
26+
image: jboss/keycloak:12.0.4
27+
networks:
28+
- backend
29+
environment:
30+
DB_VENDOR: POSTGRES
31+
DB_ADDR: postgres
32+
DB_DATABASE: keycloak
33+
DB_USER: keycloak
34+
DB_SCHEMA: public
35+
DB_PASSWORD: password
36+
KEYCLOAK_USER: admin
37+
KEYCLOAK_PASSWORD: Pa55w0rd
38+
ports:
39+
- 8480:8080
40+
depends_on:
41+
- postgres
42+
#command: -Dkeycloak.migration.action=export -Dkeycloak.migration.provider=dir -Dkeycloak.migration.dir=/tmp/keycloak/export-import #export data
43+
#command: -Dkeycloak.migration.action=import -Dkeycloak.migration.provider=dir -Dkeycloak.migration.dir=/tmp/keycloak/export-import -Dkeycloak.migration.strategy=IGNORE_EXISTING #import data
44+
volumes:
45+
- ./docker-compose-setup/keycloak-export-import:/tmp/keycloak/export-import/
46+
mongo:
47+
image: mongo:3.4
48+
container_name: codever-mongo
49+
networks:
50+
- backend
51+
environment:
52+
- MONGO_INITDB_DATABASE=dev-bookmarks
53+
- MONGO_INITDB_ROOT_USERNAME=mongoadmin
54+
- MONGO_INITDB_ROOT_PASSWORD=secret
55+
ports:
56+
- 27017:27017
57+
volumes:
58+
- ./docker-compose-setup/init-mongo.js:/docker-entrypoint-initdb.d/init-mongo.js:ro
59+
- mongo_data:/data/db

0 commit comments

Comments
 (0)