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

Commit c7a74f0c authored by Florent VINCENT's avatar Florent VINCENT 👾
Browse files

Merge branch 'ecloud-accounts' into 'nc-21' 

Ecloud accounts

See merge request !59
parents 0b0551b5 8885cce7

Dockerfile

+9 −8
Original line number Diff line number Diff line 
FROM nextcloud:21.0.7-fpm AS nextcloud

ARG BASE_DIR="/usr/src/nextcloud"

ARG TMP_PATCH_DIR="/tmp/build_patches"

ARG THEME_VERSION="21.1.0"

ARG THEME_VERSION="21.1.1"

ARG THEME_HELPER_VERSION="1.0.2"

ARG NEWS_VERSION="17.0.1"

ARG QUOTA_WARN_VERSION="1.13.0"
@@ -12,12 +12,12 @@ ARG USER_BACKEND_RAW_SQL_VERSION="1.1.1" 
ARG EMAIL_RECOVERY_JOB_ID="199763"

ARG RAINLOOP_VERSION="7.1.2"

ARG RAINLOOP_COMMIT_SHA="e9da581c"

ARG EDA_TAG="nc-21"

ARG EA_TAG="1.0.0"

ARG ECLOUD_LAUNCHER_JOB_ID="222001"

ARG GOOGLE_INTEGRATION_VERSION="1.0.6"



COPY patches/ ${TMP_PATCH_DIR}/

RUN sed -i 's/21,0,7,0/21,0,7,12/' ${BASE_DIR}/version.php

RUN sed -i 's/21,0,7,0/21,0,7,18/' ${BASE_DIR}/version.php



# Install unzip for unzipping artifacts

RUN apt-get update && apt-get install unzip
@@ -65,11 +65,6 @@ RUN curl -fsSL -o rainloop.tar.gz \ 
    mv "${BASE_DIR}/custom_apps/rainloop-nextcloud-${RAINLOOP_VERSION}-${RAINLOOP_COMMIT_SHA}" "${BASE_DIR}/custom_apps/rainloop" && \

    rm rainloop.tar.gz;



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

    "https://gitlab.e.foundation/e/infra/selfhost/nextcloud-apps/ecloud-drop-account/-/archive/${EDA_TAG}/ecloud-drop-account-${EDA_TAG}.tar.gz" && \

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

    mv "${BASE_DIR}/custom_apps/ecloud-drop-account-${EDA_TAG}" "${BASE_DIR}/custom_apps/ecloud_drop_account" && \

    rm ecloud_drop_account.tar.gz;



RUN curl -fsSL -o ecloud-theme-helper.tar.gz \

    "https://gitlab.e.foundation/e/infra/selfhost/nextcloud-apps/ecloud-theme-helper/-/archive/${THEME_HELPER_VERSION}/ecloud-theme-helper-${THEME_HELPER_VERSION}.tar.gz" && \
@@ -89,6 +84,12 @@ RUN curl -fsSL -o integration_google.tar.gz \ 
    chown -R www-data:www-data ${BASE_DIR}/custom_apps/integration_google && \

    rm integration_google.tar.gz;



RUN curl -fsSL -o ecloud-accounts.tar.gz \

    "https://gitlab.e.foundation/e/infra/selfhost/nextcloud-apps/ecloud-drop-account/-/archive/${EA_TAG}/ecloud-drop-account-${EA_TAG}.tar.gz" && \

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

    mv "${BASE_DIR}/custom_apps/ecloud-drop-account-${EA_TAG}" "${BASE_DIR}/custom_apps/ecloud-accounts" && \

    rm ecloud-accounts.tar.gz;



# Remove unzip when unzipping is done

RUN apt-get -y remove unzip

custom_entrypoint.sh

+5 −1
Original line number Diff line number Diff line
@@ -40,12 +40,16 @@ if [ "$(id -u)" = 0 ]; then 
    su -p www-data -s /bin/sh -c "php $DST_DIR/occ app:disable apporder"

    su -p www-data -s /bin/sh -c "php $DST_DIR/occ app:enable ecloud-launcher"

    su -p www-data -s /bin/sh -c "php $DST_DIR/occ app:enable ecloud-theme-helper"

    su -p www-data -s /bin/sh -c "php $DST_DIR/occ app:disable ecloud_drop_account"

    su -p www-data -s /bin/sh -c "php $DST_DIR/occ app:enable ecloud-accounts"

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

    su -p www-data -s /bin/sh -c "php $DST_DIR/occ config:system:set theme --value='eCloud'"

else

    sh -c "php $DST_DIR/occ app:disable apporder"

    sh -c "php $DST_DIR/occ app:enable ecloud-launcher"

    sh -c "php $DST_DIR/occ app:disable ecloud-theme-helper"

    sh -c "php $DST_DIR/occ app:enable ecloud-theme-helper"

    sh -c "php $DST_DIR/occ app:disable ecloud_drop_account"

    sh -c "php $DST_DIR/occ app:enable ecloud-accounts"

    sh -c "php $DST_DIR/occ config:system:set integrity.check.disabled --value='true' --type=boolean"

    sh -c "php $DST_DIR/occ config:system:set theme --value='eCloud'"    

fi