diff --git a/Dockerfile b/Dockerfile index b522c8f9..5460af81 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM python:3.10 +FROM python:3.11 ARG TAPIR_VERSION ENV TAPIR_VERSION=$TAPIR_VERSION ENV PYTHONUNBUFFERED=1 diff --git a/docker-compose.yml b/docker-compose.yml index c61c80d5..75308442 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -1,33 +1,16 @@ version: "3.9" services: - keycloak-server: + keycloak: build: context: ./docker/keycloak dockerfile: Dockerfile - ports: - "8080:8080" - volumes: - ./docker/keycloak/import:/opt/keycloak/data/import - environment: KEYCLOAK_ADMIN: admin KEYCLOAK_ADMIN_PASSWORD: admin - - openldap: - image: "osixia/openldap" - environment: - LDAP_ORGANISATION: "WirGarten Lüneburg" - LDAP_DOMAIN: "lueneburg.wirgarten.com" - LDAP_ADMIN_PASSWORD: "admin" - LDAP_READONLY_USER: "true" - ports: - - "389:389" - volumes: - - ./ldap_testdata.ldif:/container/service/slapd/assets/config/bootstrap/ldif/custom/50-testdata.ldif - # Required so that the container doesn't modify the testdata ldif - command: --copy-service web: build: . @@ -40,10 +23,9 @@ services: VIRTUAL_HOST: localhost DEBUG: 1 depends_on: - - openldap - db - selenium - - keycloak-server + - keycloak nginx-proxy: image: jwilder/nginx-proxy diff --git a/docker/keycloak/Dockerfile b/docker/keycloak/Dockerfile index 4f10e208..005ab626 100644 --- a/docker/keycloak/Dockerfile +++ b/docker/keycloak/Dockerfile @@ -1,11 +1,10 @@ -FROM quay.io/keycloak/keycloak:20.0.1 +FROM quay.io/keycloak/keycloak:20.0.3 COPY ./import/*.json /opt/keycloak/data/import/ -#RUN /opt/keycloak/bin/kc.sh import --dir /opt/keycloak/data/import +RUN /opt/keycloak/bin/kc.sh import --dir /opt/keycloak/data/import ENV ROOT_LOGLEVEL=ALL - -ENV KEYCLOAK_LOGLEVEL=DEBUG +ENV KEYCLOAK_LOGLEVEL=ALL CMD ["start-dev"] \ No newline at end of file diff --git a/docker/keycloak/import/master-realm.json b/docker/keycloak/import/master-realm.json deleted file mode 100644 index bbf10e6d..00000000 --- a/docker/keycloak/import/master-realm.json +++ /dev/null @@ -1,1863 +0,0 @@ -{ - "id" : "d2b4d76c-26b9-42f8-8481-793fa013bfb5", - "realm" : "master", - "displayName" : "Keycloak", - "displayNameHtml" : "