Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Unverified Commit 4ba69c98 authored by Akhil's avatar Akhil 🙂
Browse files

Add custom oidc version

parent 36499292

Dockerfile

+4 −3
Original line number Diff line number Diff line
@@ -13,7 +13,7 @@ ARG ECLOUD_LAUNCHER_JOB_ID="458901" 
ARG GOOGLE_INTEGRATION_VERSION="1.0.8"





RUN sed -i 's/24,0,8,2/24,0,8,5/' ${BASE_DIR}/version.php

RUN sed -i 's/24,0,8,2/24,0,8,6/' ${BASE_DIR}/version.php

COPY custom_entrypoint.sh /

RUN chmod +x /custom_entrypoint.sh

RUN mkdir -p /var/www/skeleton/Documents && mkdir -p /var/www/skeleton/Images
@@ -139,7 +139,7 @@ ARG BASE_DIR="/usr/src/nextcloud" 
ARG TMP_PATCH_DIR="/tmp/build_patches"

ARG THEME_VERSION="24.0.1"

ARG LDAP_WRITE_SUPPORT_VERSION="1.6.0"

ARG OIDC_LOGIN_VERSION="2.4.0"

ARG OIDC_LOGIN_VERSION="provider-session-beta"



# Patches

COPY patches/ ${TMP_PATCH_DIR}/
@@ -158,7 +158,8 @@ RUN curl -fsSL -o ldap_write_support.tar.gz \ 
    rm ldap_write_support.tar.gz



RUN curl -fsSL -o oidc_login.tar.gz \

    "https://github.com/pulsejet/nextcloud-oidc-login/releases/download/v${OIDC_LOGIN_VERSION}/oidc_login.tar.gz" && \

    "https://github.com/e-foundation/nextcloud-oidc-login/releases/download/${OIDC_LOGIN_VERSION}/oidc_login.tar.gz" && \

    #"https://github.com/pulsejet/nextcloud-oidc-login/releases/download/v${OIDC_LOGIN_VERSION}/oidc_login.tar.gz" && \

    tar -xf oidc_login.tar.gz -C ${BASE_DIR}/custom_apps && \

    rm oidc_login.tar.gz

custom_entrypoint.sh

+2 −0
Original line number Diff line number Diff line
@@ -38,8 +38,10 @@ fi 


if [ "$(id -u)" = 0 ]; then

    su -p www-data -s /bin/sh -c "php $DST_DIR/occ config:system:set profile.enabled --value=false --type=boolean"

    su -p www-data -s /bin/sh -c "php $DST_DIR/occ config:system:set oidc_refresh_tokens_enabled --value=true --type=boolean"

else

    sh -c "php $DST_DIR/occ config:system:set profile.enabled --value=false --type=boolean"

    sh -c "php $DST_DIR/occ config:system:set oidc_refresh_tokens_enabled --value=true --type=boolean"

fi



/entrypoint.sh "$@"