diff --git a/README.md b/README.md index 2fca723..65d087d 100644 --- a/README.md +++ b/README.md @@ -10,5 +10,4 @@ 1. Create `admin` user, add to `sudo` group 1. Put all your secrets into `/opt/.env` file 1. Put S3 secrets into `/home/admin/.aws/credentials` (according to boto3) -1. Put Flask dashboard config into `/opt/dashboard.cfg` file 1. Run ansible diff --git a/docker-compose.yml b/docker-compose.yml index c8c4b46..9b0168d 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -1,5 +1,4 @@ --- -version: '3.8' services: app: build: @@ -18,6 +17,7 @@ services: - rabbitmq - image_resizer - redis + - keycloak image_resizer: build: @@ -29,6 +29,36 @@ services: volumes: - ./image_resizer:/opt/image_resizer - images:/images + + postgres: + image: postgres:16.0 + environment: + POSTGRES_USER: testkeycloakuser + POSTGRES_PASSWORD: testkeycloakpassword + POSTGRES_DB: testkeycloakdb + ports: + - 5432:5432 + volumes: + - postgres_data:/var/lib/postgresql/data + restart: always + + keycloak: + image: keycloak/keycloak:26.0.1 + environment: + - KEYCLOAK_ADMIN=admin + - KEYCLOAK_ADMIN_PASSWORD=admin + - KC_DB=postgres + - KC_DB_URL=jdbc:postgresql://postgres:5432/testkeycloakdb + - KC_DB_USERNAME=testkeycloakuser + - KC_DB_PASSWORD=testkeycloakpassword + - KC_HOSTNAME=localhost + - KC_PROXY=edge + - KC_LOG_LEVEL=DEBUG + ports: + - 8080:8080 + command: "start-dev" + depends_on: + - postgres elasticsearch: build: @@ -75,3 +105,4 @@ services: volumes: esdata01: images: + postgres_data: diff --git a/image_resizer b/image_resizer index b058243..c17984b 160000 --- a/image_resizer +++ b/image_resizer @@ -1 +1 @@ -Subproject commit b058243d6888f192321a74b0c8beba6e7dca994c +Subproject commit c17984bd88b521a572ac1dd3a9062ef32d45992b diff --git a/wiating_backend b/wiating_backend index 9e8be05..808dfb3 160000 --- a/wiating_backend +++ b/wiating_backend @@ -1 +1 @@ -Subproject commit 9e8be05636ae851ae8e730d43168eef2ee468f57 +Subproject commit 808dfb3e182012685ce18487d1ab9e28f013026f