added postgres submodule

This commit is contained in:
Alfredo Oliviero 2024-10-15 16:47:41 +02:00
parent c01e21cb59
commit 62953a8690
7 changed files with 65 additions and 46 deletions

8
.env
View File

@ -1,3 +1,11 @@
KEYCLOAK_VERSION=24.0.3
KEYCLOAK_ADMIN=admin
KEYCLOAK_ADMIN_PASSWORD=admin
REALM_FILE=d4science.json
ARTIFACTS_VERSION=2.1.0
KC_FEATURES=admin-fine-grained-authz,token-exchange
KC_LOG_LEVEL=ALL
CASSANDRA_CLUSTER_NAME=TestCluster CASSANDRA_CLUSTER_NAME=TestCluster
CASSANDRA_SEEDS=cassandra1,cassandra2,cassandra3 CASSANDRA_SEEDS=cassandra1,cassandra2,cassandra3
CASSANDRA_NUM_TOKENS=256 CASSANDRA_NUM_TOKENS=256

7
.gitmodules vendored
View File

@ -5,7 +5,12 @@
[submodule "cassandra"] [submodule "cassandra"]
path = cassandra path = cassandra
url = gitea@code-repo.d4science.org:alfredo.oliviero/dockerizing_cassandra.git url = gitea@code-repo.d4science.org:alfredo.oliviero/dockerizing_cassandra.git
[submodule "keycloak"] [submodule "keycloak"]
path = keycloak path = keycloak
url = gitea@code-repo.d4science.org:gCubeSystem/gcube-d4science-keycloak-docker-local.git url = gitea@code-repo.d4science.org:gCubeSystem/gcube-d4science-keycloak-docker-local.git
[submodule "liferay"]
path = liferay
url = gitea@code-repo.d4science.org:alfredo.oliviero/dockerizing_liferay.git
[submodule "postgres"]
path = postgres
url = gitea@code-repo.d4science.org:alfredo.oliviero/dockerizing_postgres.git

View File

@ -1,10 +1,19 @@
# Docker Cassandra Social # Dockerizing D4SCIENCE
## subprojects: ## subprojects:
* [cassandra](./cassandra/README.md) * [cassandra](./cassandra/README.md)
* [socialservice](./socialservice/README.md) * [socialservice](./socialservice/README.md)
the first time you check-out a repo you need to use --init
`git submodule update --init --recursive`
the other times
`git pull --recurse-submodules`
### cassandra ### cassandra
[cassandra](./cassandra/README.md) is the dockerization of the cassandra infrastructure [cassandra](./cassandra/README.md) is the dockerization of the cassandra infrastructure
@ -26,7 +35,42 @@ force recreate docker image
`docker compose build --no-cache` `docker compose build --no-cache`
check status: check status:
`docker exec -it cassandra-1 nodetool status` `docker exec -it cassandra1 nodetool status`
`docker exec -it cassandra-2 nodetool status` `docker exec -it cassandra2 nodetool status`
`docker exec -it cassandra-3 nodetool status` `docker exec -it cassandra3 nodetool status`
`docker exec -it social nodetool status` `docker exec -it social nodetool status`
## LIFERAY
aggiunto a /etc/host l'entry:
127.0.0.1 keycloak
127.0.0.1 liferay
keycloak server: http://keycloak:9999
liferay server:
* http://liferay:80
* http://next.dev.d4science.org:80
start composer:
`docker compose up --build`
check keycloak status:
* postgres: `docker inspect --format='{{json .State.Health}}' lr_docker-postgres-1`
* keycloak: `docker inspect --format='{{json .State.Health}}' lr_docker-keycloak-1`
* liferay: `docker inspect --format='{{json .State.Health}}' lr_docker-liferay-1`
run a single service:
* postgres: `docker compose up postgres --build`
* keycloak: `docker compose up keycloak --build`
* liferay: `docker compose up liferay --build`
open bash on server
* postgres: `docker exec -it lr_docker-postgres-1 /bin/sh`
* keycloak: `docker exec -it lr_docker-keycloak-1 /bin/sh`
* liferay: `docker exec -it lr_docker-liferay-1 /bin/sh`
check db connection:
docker exec -it lr_docker-liferay-1 bash -c 'PGPASSWORD=pass_db psql -h lr_docker-postgres-1 -U infra_bundle_dev -d liferay_db'

View File

@ -1,41 +0,0 @@
version: '3.8'
services:
cassandra1:
extends:
file: ./cassandra/compose.yml
service: cassandra1
networks:
- app-network
cassandra2:
extends:
file: ./cassandra/compose.yml
service: cassandra2
networks:
- app-network
cassandra3:
extends:
file: ./cassandra/compose.yml
service: cassandra3
networks:
- app-network
tomcat:
extends:
file: ./socialservice/compose.yml
service: tomcat
depends_on:
cassandra1:
condition: service_healthy
cassandra2:
condition: service_healthy
cassandra3:
condition: service_healthy
networks:
- app-network
networks:
app-network:
driver: bridge

1
keycloak Submodule

@ -0,0 +1 @@
Subproject commit c80b596a66d35b5f69e10ad3641ba5a3fa9d2c54

1
liferay Submodule

@ -0,0 +1 @@
Subproject commit 55fc72b9f1fce73790d0b2b752518ed8ab096ab9

1
postgres Submodule

@ -0,0 +1 @@
Subproject commit 217ca84114ecd45e86e0ad55fced99644ef980ca