...
 
Commits (9)
    https://gitcode.net/awesome-mirrors/laradock/laradock/-/commit/3600dc82061658efbf8f0a120a2c0da5336542f2 added installation of custom ca-certificates 2023-04-24T13:15:16+02:00 Max Weber mweber@kzvnr.de https://gitcode.net/awesome-mirrors/laradock/laradock/-/commit/f831a05d05831f9821ee33b7eda19b49c9d51bca updated dokumentation 2023-04-24T13:24:08+02:00 Max Weber mweber@kzvnr.de https://gitcode.net/awesome-mirrors/laradock/laradock/-/commit/680a560628a631b006dcfe32e18ac33a1fcbecab removed sentry from docker-compose 2023-04-24T16:35:14+02:00 DrDynamic github@mweber.me https://gitcode.net/awesome-mirrors/laradock/laradock/-/commit/e36150e11103b8172b74317e2c00afc48bbfdb16 ceaned up .env.example 2023-04-24T16:40:07+02:00 DrDynamic github@mweber.me https://gitcode.net/awesome-mirrors/laradock/laradock/-/commit/25309a8e9c891c775ba87e6279369a4009710e21 added keycloak 2023-04-26T21:50:44+02:00 Max Weber mweber@kzvnr.de https://gitcode.net/awesome-mirrors/laradock/laradock/-/commit/ae8ec392b7674be6221b847e5b0fb8fa8bfc570c added documentation 2023-04-26T22:04:43+02:00 Max Weber mweber@kzvnr.de https://gitcode.net/awesome-mirrors/laradock/laradock/-/commit/905412497e29767e8ef69d773c0136d8a25a1f23 added init script for postgres 2023-04-27T12:56:17+02:00 Max Weber mweber@kzvnr.de https://gitcode.net/awesome-mirrors/laradock/laradock/-/commit/a7600e844e7a1ce427a60f1176079641a638a8a4 Merge pull request #3379 from DrDynamic/ca-certificates 2023-04-28T23:31:45+08:00 Shao Yu-Lung (Allen) bestlong168@gmail.com add ca-certificates https://gitcode.net/awesome-mirrors/laradock/laradock/-/commit/1473bbfbd949dfb6c8632c2ae5ec026ea46cee6b Merge pull request #3380 from DrDynamic/keycloak 2023-04-28T23:32:09+08:00 Shao Yu-Lung (Allen) bestlong168@gmail.com add Keycloak
......@@ -1067,3 +1067,15 @@ SOKETI_METRICS_SERVER_PORT=9601
### ONEDEV ##################################################
ONEDEV_HTTP_PORT=6610
ONEDEV_SSH_PORT=6611
### Keycloak ################################################
KEYCLOAK_VERSION=latest
KEYCLOAK_POSTGRES_INIT=true
KEYCLOAK_HTTP_PORT=8081
KEYCLOAK_CREATE_ADMIN_USER=true
KEYCLOAK_ADMIN_USER='admin'
KEYCLOAK_ADMIN_PASSWORD='secret'
KEYCLOAK_POSTGRES_HOST=postgres
KEYCLOAK_POSTGRES_USER=laradock_keycloak
KEYCLOAK_POSTGRES_PASSWORD=laradock_keycloak
KEYCLOAK_POSTGRES_DB=laradock_keycloak
......@@ -1490,6 +1490,23 @@ docker-compose exec tarantool console
7 - There you can operate with tarantool database ([official documentation](https://www.tarantool.io/en/doc/latest/) can be helpful).
<br>
<a name="use Keycloak"></a>
## Use Keycloak
1. Run the Keycloak Container (`keycloak`) with the `docker-compose up` command. Example:
```bash
docker-compose up -d keycloak
```
2. Open your browser and visit the localhost on port 8081: `http://localhost:8081`
3. Login with the following credentials:
- Username: `admin`
- Password: `secret`
<br>
<a name="CodeIgniter"></a>
......@@ -2525,6 +2542,13 @@ docker-compose up ...
*Note: If you faced any errors, try restarting Docker, and make sure you have no spaces in the `d4m-nfs-mounts.txt` file, and your `/etc/exports` file is clear.*
<br>
<a name="ca-certificates"></a>
## ca-certificates
To install your own CA certificates, you can add them to the `workspace/ca-certificates` folder.
This way the certificates will be installed into the system ca store of the workspace container.
<br>
<a name="upgrade-laradock"></a>
......
......@@ -631,6 +631,10 @@ services:
- GITLAB_POSTGRES_USER=${GITLAB_POSTGRES_USER}
- GITLAB_POSTGRES_PASSWORD=${GITLAB_POSTGRES_PASSWORD}
- GITLAB_POSTGRES_DB=${GITLAB_POSTGRES_DB}
- KEYCLOAK_POSTGRES_INIT=${KEYCLOAK_POSTGRES_INIT}
- KEYCLOAK_POSTGRES_USER=${KEYCLOAK_POSTGRES_USER}
- KEYCLOAK_POSTGRES_PASSWORD=${KEYCLOAK_POSTGRES_PASSWORD}
- KEYCLOAK_POSTGRES_DB=${KEYCLOAK_POSTGRES_DB}
- JUPYTERHUB_POSTGRES_INIT=${JUPYTERHUB_POSTGRES_INIT}
- JUPYTERHUB_POSTGRES_USER=${JUPYTERHUB_POSTGRES_USER}
- JUPYTERHUB_POSTGRES_PASSWORD=${JUPYTERHUB_POSTGRES_PASSWORD}
......@@ -2100,3 +2104,24 @@ services:
- frontend
- backend
restart: always
### keycloak ##################################################
keycloak:
image: bitnami/keycloak:${KEYCLOAK_VERSION}
ports:
- "${KEYCLOAK_HTTP_PORT}:${KEYCLOAK_HTTP_PORT}"
environment:
- KEYCLOAK_HTTP_PORT=${KEYCLOAK_HTTP_PORT}
- KEYCLOAK_CREATE_ADMIN_USER=${KEYCLOAK_CREATE_ADMIN_USER}
- KEYCLOAK_ADMIN_USER=${KEYCLOAK_ADMIN_USER}
- KEYCLOAK_ADMIN_PASSWORD=${KEYCLOAK_ADMIN_PASSWORD}
- KEYCLOAK_DATABASE_HOST=${KEYCLOAK_POSTGRES_HOST}
- KEYCLOAK_DATABASE_PORT=${POSTGRES_PORT}
- KEYCLOAK_DATABASE_NAME=${KEYCLOAK_POSTGRES_DB}
- KEYCLOAK_DATABASE_USER=${KEYCLOAK_POSTGRES_USER}
- KEYCLOAK_DATABASE_PASSWORD=${KEYCLOAK_POSTGRES_PASSWORD}
depends_on:
- postgres
networks:
- frontend
- backend
#!/bin/bash
#
# Copy createdb.sh.example to createdb.sh
# then uncomment then set database name and username to create you need databases
#
# example: .env POSTGRES_USER=appuser and need db name is myshop_db
#
# psql -v ON_ERROR_STOP=1 --username "$POSTGRES_USER" --dbname "$POSTGRES_DB" <<-EOSQL
# CREATE USER myuser WITH PASSWORD 'mypassword';
# CREATE DATABASE myshop_db;
# GRANT ALL PRIVILEGES ON DATABASE myshop_db TO myuser;
# EOSQL
#
# this sh script will auto run when the postgres container starts and the $DATA_PATH_HOST/postgres not found.
#
#
# psql -v ON_ERROR_STOP=1 --username "$POSTGRES_USER" --dbname "$POSTGRES_DB" <<-EOSQL
# CREATE USER db1 WITH PASSWORD 'db1';
# CREATE DATABASE db1;
# GRANT ALL PRIVILEGES ON DATABASE db1 TO db1;
# EOSQL
#
# psql -v ON_ERROR_STOP=1 --username "$POSTGRES_USER" --dbname "$POSTGRES_DB" <<-EOSQL
# CREATE USER db2 WITH PASSWORD 'db2';
# CREATE DATABASE db2;
# GRANT ALL PRIVILEGES ON DATABASE db2 TO db2;
# EOSQL
#
# psql -v ON_ERROR_STOP=1 --username "$POSTGRES_USER" --dbname "$POSTGRES_DB" <<-EOSQL
# CREATE USER db3 WITH PASSWORD 'db3';
# CREATE DATABASE db3;
# GRANT ALL PRIVILEGES ON DATABASE db3 TO db3;
# EOSQL
#
### default database and user for keycloak ##############################################
if [ "$KEYCLOAK_POSTGRES_INIT" == 'true' ]; then
psql -v ON_ERROR_STOP=1 --username "$POSTGRES_USER" --dbname "$POSTGRES_DB" <<-EOSQL
CREATE USER $KEYCLOAK_POSTGRES_USER WITH PASSWORD '$KEYCLOAK_POSTGRES_PASSWORD';
CREATE DATABASE $KEYCLOAK_POSTGRES_DB;
GRANT ALL PRIVILEGES ON DATABASE $KEYCLOAK_POSTGRES_DB TO $KEYCLOAK_POSTGRES_USER;
ALTER ROLE $KEYCLOAK_POSTGRES_USER CREATEROLE SUPERUSER;
EOSQL
echo
fi
......@@ -198,6 +198,15 @@ COPY ./crontab /etc/cron.d
RUN chmod -R 644 /etc/cron.d
###########################################################################
# Certificate Authorities
###########################################################################
USER root
COPY ./ca-certificates/* /usr/local/share/ca-certificates/
RUN update-ca-certificates
###########################################################################
# Drush:
###########################################################################
......