flywithu/kopano-docker
1
0
Fork 0
mirror of https://github.com/zokradonh/kopano-docker synced 2025-10-31 02:17:47 +00:00
Code Issues Releases Wiki Activity

make it possible to specify the path when running konnect in a subpath (#320)

Browse Source 
* make it possible to specify the path when running konnect in a subpath
This commit is contained in:
Felix Bartels 2020-02-04 16:39:40 +01:00 committed by GitHub
parent 8d0a0fd8f5
commit f998cdb7b2
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 20 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
web/Dockerfile
View File

@ -4,23 +4,26 @@ FROM kopano/kwebd:${CODE_VERSION}
ARG VCS_REF ARG VCS_REF
ARG CODE_VERSION ARG CODE_VERSION
ENV CODE_VERSION="${CODE_VERSION}" ENV \
ENV DEFAULTREDIRECT="/webapp" CODE_VERSION="${CODE_VERSION}" \
# Workaround to not break backwards compatibility, DEFAULTREDIRECT="/webapp" \
KONNECTPATH=kopanoid
# FIXME Workaround to not break backwards compatibility,
# since an underscore is not a valid char in a hostname. # since an underscore is not a valid char in a hostname.
# This causes issues when using kweb in kubernetes. # This causes issues when using kweb in kubernetes.
# Related issue https://github.com/docker/compose/issues/229 # Related issue https://github.com/docker/compose/issues/229
ENV KWEBD_DNS_KONNECT="kopano_konnect" ENV \
ENV KWEBD_DNS_MEET="kopano_meet" KWEBD_DNS_KONNECT="kopano_konnect" \
ENV KWEBD_DNS_KAPI="kopano_kapi" KWEBD_DNS_MEET="kopano_meet" \
ENV KWEBD_DNS_PLAYGROUND="kopano_playground" KWEBD_DNS_KAPI="kopano_kapi" \
ENV KWEBD_DNS_KWMSERVER="kopano_kwmserver" KWEBD_DNS_PLAYGROUND="kopano_playground" \
ENV KWEBD_DNS_WEBAPP="kopano_webapp" KWEBD_DNS_KWMSERVER="kopano_kwmserver" \
ENV KWEBD_DNS_ZPUSH="kopano_zpush" KWEBD_DNS_WEBAPP="kopano_webapp" \
ENV KWEBD_DNS_ICAL="kopano_ical" KWEBD_DNS_ZPUSH="kopano_zpush" \
ENV KWEBD_DNS_KDAV="kopano_kdav" KWEBD_DNS_ICAL="kopano_ical" \
ENV KWEBD_DNS_GRAPI="kopano_grapi" KWEBD_DNS_KDAV="kopano_kdav" \
ENV KWEBD_DNS_ICAL="kopano_ical" KWEBD_DNS_GRAPI="kopano_grapi" \
KWEBD_DNS_ICAL="kopano_ical"
ENV DOCKERIZE_VERSION v0.6.1 ENV DOCKERIZE_VERSION v0.6.1
RUN wget https://github.com/jwilder/dockerize/releases/download/$DOCKERIZE_VERSION/dockerize-alpine-linux-amd64-$DOCKERIZE_VERSION.tar.gz \ RUN wget https://github.com/jwilder/dockerize/releases/download/$DOCKERIZE_VERSION/dockerize-alpine-linux-amd64-$DOCKERIZE_VERSION.tar.gz \

6
web/kweb.cfg
View File

@ -64,11 +64,11 @@
} }
redir /signin /signin/v1/identifier redir /signin /signin/v1/identifier
# Konnect in subpath - this config supports /kopanoid as a subpath # Konnect in subpath - by default this config supports /kopanoid as a subpath
rewrite /kopanoid/konnect/v1/ { rewrite /{%KONNECTPATH%}/konnect/v1/ {
to /upstreams/konnect/{path} to /upstreams/konnect/{path}
} }
rewrite /kopanoid/signin/v1/ { rewrite /{%KONNECTPATH%}/signin/v1/ {
to /upstreams/konnect/{path} to /upstreams/konnect/{path}
} }