Meetling/Docker-Compose
2
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

update

Browse source
This commit is contained in:
holzi1005 2024-12-08 18:15:36 +01:00
parent a53b66fc3b
commit abb4361546
3 changed files with 14 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
.docker-compose.http.yml
View file

@ -25,7 +25,9 @@ services:
extra_hosts: extra_hosts:
- "<clientUrl>:<hostIp>" - "<clientUrl>:<hostIp>"
env_file: env_file:
- ./.env
- ./.env.local - ./.env.local
- ./.env.custom
labels: labels:
- "traefik.enable=true" - "traefik.enable=true"
- "traefik.http.routers.websocket-ja.rule=Host(`<clientUrl>`) && PathPrefix(`/ws`)" - "traefik.http.routers.websocket-ja.rule=Host(`<clientUrl>`) && PathPrefix(`/ws`)"
@ -42,7 +44,9 @@ services:
db-ja: db-ja:
condition: service_healthy condition: service_healthy
env_file: env_file:
- ./.env
- ./.env.local - ./.env.local
- ./.env.custom
extra_hosts: extra_hosts:
- "<clientUrl>:<hostIp>" - "<clientUrl>:<hostIp>"
labels: labels:
@ -50,7 +54,6 @@ services:
- "traefik.http.routers.app-ja.rule=Host(`<clientUrl>`)" - "traefik.http.routers.app-ja.rule=Host(`<clientUrl>`)"
- "traefik.http.routers.app-ja.entrypoints=web" - "traefik.http.routers.app-ja.entrypoints=web"
volumes: volumes:
- ja_data:/var/www/html/data
- theme_data:/var/www/html/theme - theme_data:/var/www/html/theme
- image_upload:/var/www/html/public/uploads/images - image_upload:/var/www/html/public/uploads/images
- theme_assests_data:/var/www/html/public/theme - theme_assests_data:/var/www/html/public/theme
@ -82,7 +85,9 @@ services:
db-ja: db-ja:
condition: service_healthy condition: service_healthy
env_file: env_file:
- ./.env
- ./.env.local - ./.env.local
- ./.env.custom
restart: unless-stopped restart: unless-stopped
command: command:
- start-dev - start-dev
@ -104,7 +109,6 @@ networks:
volumes: volumes:
mariadb: mariadb:
ja_data:
image_upload: image_upload:
theme_data: theme_data:
theme_assests_data: theme_assests_data:

1
.gitignore vendored
View file

@ -1,6 +1,7 @@
# Ignore Local Docker Config # Ignore Local Docker Config
docker.conf docker.conf
.env.local .env.local
.env.custom
# Ignore Custom Keycloak Realm # Ignore Custom Keycloak Realm
keycloak/realm-export.json keycloak/realm-export.json

14
setup.sh
View file

@ -33,14 +33,14 @@ else
touch $FILE touch $FILE
KEYCLOAK_PW=$(date +%s | sha256sum | base64 | head -c 32) KEYCLOAK_PW=$(date +%s | sha256sum | base64 | head -c 32)
JITSI_ADMIN_PW=$(date +%s | sha256sum | base64 | head -c 32) JITSI_ADMIN_PW=$(date +%s | sha256sum | base64 | head -c 32)
WEBSOCKET_SECRET=$(date +%s | sha256sum | base64 | head -c 32) MERCURE_JWT_SECRET=$(date +%s | sha256sum | base64 | head -c 32)
KEYCLOAK_ADMIN_PW=$(date +%s | sha256sum | base64 | head -c 32) KEYCLOAK_ADMIN_PW=$(date +%s | sha256sum | base64 | head -c 32)
KEYCLOAK_CLIENT_SECRET=$(date +%s | sha256sum | base64 | head -c 32) NEW_UUID=$(date +%s | sha256sum | base64 | head -c 32)
echo "KEYCLOAK_PW=$KEYCLOAK_PW" >> $FILE echo "KEYCLOAK_PW=$KEYCLOAK_PW" >> $FILE
echo "JITSI_ADMIN_PW=$JITSI_ADMIN_PW" >> $FILE echo "JITSI_ADMIN_PW=$JITSI_ADMIN_PW" >> $FILE
echo "WEBSOCKET_SECRET=$WEBSOCKET_SECRET" >> $FILE echo "MERCURE_JWT_SECRET=$MERCURE_JWT_SECRET" >> $FILE
echo "KEYCLOAK_ADMIN_PW=$KEYCLOAK_ADMIN_PW" >> $FILE echo "KEYCLOAK_ADMIN_PW=$KEYCLOAK_ADMIN_PW" >> $FILE
echo "KEYCLOAK_CLIENT_SECRET=$KEYCLOAK_CLIENT_SECRET" >> $FILE echo "NEW_UUID=$NEW_UUID" >> $FILE
source $FILE source $FILE
fi fi
ENVIRONMENT=${ENVIRONMENT:=prod} ENVIRONMENT=${ENVIRONMENT:=prod}
@ -74,7 +74,7 @@ echo --- 1. Build the Keycloak ----------------------------------
echo ------------------------------------------------------------ echo ------------------------------------------------------------
echo "" echo ""
cp .templates/realm-export.json keycloak/realm-export.json cp .templates/realm-export.json keycloak/realm-export.json
sed -i "s|<clientsecret>|$KEYCLOAK_CLIENT_SECRET|g" keycloak/realm-export.json sed -i "s|<clientsecret>|$NEW_UUID|g" keycloak/realm-export.json
sed -i "s|<clientUrl>|$HTTP_METHOD://$PUBLIC_URL|g" keycloak/realm-export.json sed -i "s|<clientUrl>|$HTTP_METHOD://$PUBLIC_URL|g" keycloak/realm-export.json
@ -103,7 +103,7 @@ laF_baseUrl='$HTTP_METHOD://$PUBLIC_URL'
VICH_BASE='$HTTP_METHOD://$PUBLIC_URL' VICH_BASE='$HTTP_METHOD://$PUBLIC_URL'
GIT_VERSION=1.0.12 GIT_VERSION=1.0.12
PUBLIC_URL='$PUBLIC_URL' PUBLIC_URL='$PUBLIC_URL'
OAUTH_KEYCLOAK_CLIENT_SECRET=$KEYCLOAK_CLIENT_SECRET OAUTH_KEYCLOAK_CLIENT_SECRET=$NEW_UUID
OAUTH_KEYCLOAK_SERVER='$HTTP_METHOD://$PUBLIC_URL/keycloak' OAUTH_KEYCLOAK_SERVER='$HTTP_METHOD://$PUBLIC_URL/keycloak'
OAUTH_KEYCLOAK_CLIENT_ID=jitsiadmin OAUTH_KEYCLOAK_CLIENT_ID=jitsiadmin
OAUTH_KEYCLOAK_REALM=jitsiadmin OAUTH_KEYCLOAK_REALM=jitsiadmin
@ -111,7 +111,7 @@ registerEmailAdress='notification@jitsi-admin.local'
DEFAULT_LANGUAGE=$default_language DEFAULT_LANGUAGE=$default_language
MERCURE_URL='http://websocket-ja:3000/.well-known/mercure' MERCURE_URL='http://websocket-ja:3000/.well-known/mercure'
MERCURE_PUBLIC_URL='$HTTP_METHOD://$PUBLIC_URL' MERCURE_PUBLIC_URL='$HTTP_METHOD://$PUBLIC_URL'
WEBSOCKET_SECRET=$WEBSOCKET_SECRET WEBSOCKET_SECRET=$MERCURE_JWT_SECRET
KEYCLOAK_ADMIN=admin KEYCLOAK_ADMIN=admin
KEYCLOAK_ADMIN_PASSWORD=$KEYCLOAK_ADMIN_PW KEYCLOAK_ADMIN_PASSWORD=$KEYCLOAK_ADMIN_PW
KC_DB=mariadb KC_DB=mariadb