Skip to content

Commit f612ac3

Browse files
authored
Merge pull request #1248 from Websoft9/update-keycloak-708d54de
Update keycloak
2 parents 49f578e + 762e9ba commit f612ac3

File tree

13 files changed

+21
-212
lines changed

13 files changed

+21
-212
lines changed

apps/keycloak/.env

Lines changed: 11 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -1,47 +1,19 @@
1-
W9_REPO=wordpress
2-
W9_DIST=community
3-
W9_VERSION=latest
4-
5-
W9_POWER_PASSWORD=1PrMxExC45LsCT
6-
7-
# Environments which for user settings when create application
8-
# Named expression: W9_xxx_xxx_SET, xxx refer to file fields
9-
W9_HTTP_PORT_SET=9001
10-
# W9_HTTPS_PORT_SET=9002
11-
# W9_DB_PORT_SET=3306
12-
# W9_SSH_PORT_SET=23
13-
W9_KEY_SET="dfsjdkjf77xjxcjcj"
1+
W9_REPO=keycloak/keycloak
2+
W9_DIST='community'
3+
W9_VERSION='latest'
4+
W9_HTTP_PORT_SET='9001'
5+
W9_POWER_PASSWORD='t4cd0S#PGKN5ivQ2'
146

157
#### -- Not allowed to edit below environments when recreate app based on existing data -- ####
16-
17-
W9_ID=keycloak
18-
19-
# W9_HTTP_PORT or W9_HTTPS_PORT is need at leaset and used for proxy for web application
20-
# Some container (e.g teleport) need HTTPS access, then need to set this pra
21-
W9_HTTP_PORT=80
22-
W9_HTTPS_PORT=81
23-
8+
W9_ID='keycloak'
9+
W9_HTTP_PORT=8080
2410
W9_LOGIN_USER=admin
25-
# use https://1password.com/zh-cn/password-generator/ to genarate 14 bit password
26-
# this password can also use password file
2711
W9_LOGIN_PASSWORD=$W9_POWER_PASSWORD
28-
W9_ADMIN_PATH="/wp-login"
29-
30-
# Container name's suffix must use one of the value
31-
W9_DB_EXPOSE="mysql,postgresql,mariadb,mongodb,redis"
32-
33-
# It is used when the application APP needs to set an external URL, which can be IP(or domain), IP:PORT
34-
# If have protocols, should be set it in the APP's ENV
35-
W9_URL=internet_ip:$W9_HTTP_PORT_SET
36-
# modifies W9_URL on init when it is true
37-
W9_URL_REPLACE=true
38-
12+
W9_URL='internet_ip:$W9_HTTP_PORT_SET'
3913
W9_NETWORK=websoft9
4014

41-
#### ----------------------------------------------------------------------------------------- ####
42-
15+
####Below environment is created by : https://www.keycloak.org/getting-started/getting-started-docker ####
16+
KC_BOOTSTRAP_ADMIN_USERNAME=$W9_LOGIN_USER
17+
KC_BOOTSTRAP_ADMIN_PASSWORD=$W9_LOGIN_PASSWORD
4318

44-
# Below environment is created by apphub
4519

46-
#W9_NAME=""
47-
#W9_RCODE=""

apps/keycloak/CHANGELOG.md

Lines changed: 0 additions & 5 deletions
This file was deleted.

apps/keycloak/Dockerfile

Lines changed: 0 additions & 21 deletions
This file was deleted.

apps/keycloak/Notes.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
# Appname
2-
## FAQ
1+
# Keycloak
2+
## Support multiple languages

apps/keycloak/README.jinja2

Lines changed: 0 additions & 26 deletions
This file was deleted.

apps/keycloak/docker-compose.yml

Lines changed: 8 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -1,49 +1,21 @@
1-
# image,docs: https://hub.docker.com/_/wordpress/
1+
# image: https://hub.docker.com/r/keycloak/keycloak
2+
# docs: https://www.keycloak.org/getting-started/getting-started-docker
23

34
services:
45

5-
wordpress:
6+
keycloak:
67
image: $W9_REPO:$W9_VERSION
78
container_name: $W9_ID
8-
restart: unless-stopped
9-
#This is for access host from container
10-
# extra_hosts: ["host.docker.internal:host-gateway"]
11-
# command: |
12-
# /bin/bash -c "ping -c 3 host.docker.internal"
13-
logging:
14-
driver: "json-file"
15-
options:
16-
max-file: "5"
17-
max-size: 10m
18-
deploy:
19-
resources:
20-
limits:
21-
memory: 5g
22-
cpus: '0.7'
239
ports:
24-
- $W9_HTTP_PORT_SET:80
10+
- $W9_HTTP_PORT_SET:8080
2511
env_file: .env
12+
command: start-dev
2613
volumes:
27-
- wordpress:/var/www/html
28-
- ./src/php_exra.ini:/usr/local/etc/php/conf.d/php_exra.ini
29-
30-
mariadb:
31-
image: mariadb:10.4
32-
container_name: $W9_ID-mariadb
33-
restart: unless-stopped
34-
command: --character-set-server=utf8mb4 --collation-server=utf8mb4_unicode_ci --innodb_log_buffer_size=30M
35-
volumes:
36-
- mysql_data:/var/lib/mysql
37-
environment:
38-
MYSQL_DATABASE: $W9_ID
39-
MYSQL_USER: $W9_ID
40-
MYSQL_PASSWORD: $W9_POWER_PASSWORD
41-
MYSQL_ROOT_PASSWORD: $W9_POWER_PASSWORD
14+
- keycloak_data:/opt/keycloak/data
4215

4316
volumes:
44-
wordpress:
45-
mysql_data:
46-
17+
keycloak_data:
18+
4719
networks:
4820
default:
4921
name: $W9_NETWORK

apps/keycloak/src/after_up.sh

Lines changed: 0 additions & 1 deletion
This file was deleted.

apps/keycloak/src/encrypt.sh

Lines changed: 0 additions & 12 deletions
This file was deleted.

apps/keycloak/src/filelist

Lines changed: 0 additions & 3 deletions
This file was deleted.

apps/keycloak/src/get_version.sh

Lines changed: 0 additions & 1 deletion
This file was deleted.

0 commit comments

Comments
 (0)