From 23178bd7ed1f0ec89c6dc8afe05a93e6bce903a0 Mon Sep 17 00:00:00 2001 From: Willy Kloucek Date: Wed, 29 Sep 2021 13:58:23 +0200 Subject: [PATCH] fix ldap CA config for docker images --- ocis/docker/Dockerfile.linux.amd64 | 3 ++- ocis/docker/Dockerfile.linux.arm | 3 ++- ocis/docker/Dockerfile.linux.arm64 | 3 ++- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/ocis/docker/Dockerfile.linux.amd64 b/ocis/docker/Dockerfile.linux.amd64 index 8d145ff875..8e35ade669 100644 --- a/ocis/docker/Dockerfile.linux.amd64 +++ b/ocis/docker/Dockerfile.linux.amd64 @@ -30,7 +30,8 @@ RUN mkdir -p /var/tmp/ocis && \ # default artifact location for autogenerated certificates # needs to be a static location because of the docker uid switch mechanism -ENV GLAUTH_LDAPS_CERT=/var/tmp/ocis/.config/ldap/ldaps.crt \ +ENV STORAGE_LDAP_CACERT=/var/tmp/ocis/.config/ldap/ldaps.crt \ + GLAUTH_LDAPS_CERT=/var/tmp/ocis/.config/ldap/ldaps.crt \ GLAUTH_LDAPS_KEY=/var/tmp/ocis/.config/ldap/ldaps.key \ IDP_TRANSPORT_TLS_CERT=/var/tmp/ocis/.config/idp/server.crt \ IDP_TRANSPORT_TLS_KEY=/var/tmp/ocis/.config/idp/server.key \ diff --git a/ocis/docker/Dockerfile.linux.arm b/ocis/docker/Dockerfile.linux.arm index a0408d340b..f873b4795a 100644 --- a/ocis/docker/Dockerfile.linux.arm +++ b/ocis/docker/Dockerfile.linux.arm @@ -30,7 +30,8 @@ RUN mkdir -p /var/tmp/ocis && \ # default artifact location for autogenerated certificates # needs to be a static location because of the docker uid switch mechanism -ENV GLAUTH_LDAPS_CERT=/var/tmp/ocis/.config/ldap/ldaps.crt \ +ENV STORAGE_LDAP_CACERT=/var/tmp/ocis/.config/ldap/ldaps.crt \ + GLAUTH_LDAPS_CERT=/var/tmp/ocis/.config/ldap/ldaps.crt \ GLAUTH_LDAPS_KEY=/var/tmp/ocis/.config/ldap/ldaps.key \ IDP_TRANSPORT_TLS_CERT=/var/tmp/ocis/.config/idp/server.crt \ IDP_TRANSPORT_TLS_KEY=/var/tmp/ocis/.config/idp/server.key \ diff --git a/ocis/docker/Dockerfile.linux.arm64 b/ocis/docker/Dockerfile.linux.arm64 index b8c9e82927..23d633206e 100644 --- a/ocis/docker/Dockerfile.linux.arm64 +++ b/ocis/docker/Dockerfile.linux.arm64 @@ -30,7 +30,8 @@ RUN mkdir -p /var/tmp/ocis && \ # default artifact location for autogenerated certificates # needs to be a static location because of the docker uid switch mechanism -ENV GLAUTH_LDAPS_CERT=/var/tmp/ocis/.config/ldap/ldaps.crt \ +ENV STORAGE_LDAP_CACERT=/var/tmp/ocis/.config/ldap/ldaps.crt \ + GLAUTH_LDAPS_CERT=/var/tmp/ocis/.config/ldap/ldaps.crt \ GLAUTH_LDAPS_KEY=/var/tmp/ocis/.config/ldap/ldaps.key \ IDP_TRANSPORT_TLS_CERT=/var/tmp/ocis/.config/idp/server.crt \ IDP_TRANSPORT_TLS_KEY=/var/tmp/ocis/.config/idp/server.key \