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

Commit 004ac8ad authored by Akhil's avatar Akhil 🙂
Browse files

Merge branch 'fix-theme-for-24' into 'main' 

Bump version

See merge request !145
parents 6f87ab7e f2c27f6d

Dockerfile

+4 −3
Original line number Diff line number Diff line 
FROM nextcloud:24.0.7-fpm AS nextcloud

ARG BASE_DIR="/usr/src/nextcloud"

ARG TMP_PATCH_DIR="/tmp/build_patches"

ARG THEME_HELPER_JOB_ID="433795"

ARG THEME_HELPER_JOB_ID="446245"

ARG NEWS_VERSION="19.0.0"

ARG QUOTA_WARN_VERSION="1.15.0"

ARG NOTES_VERSION="4.5.1"
@@ -16,7 +16,7 @@ ARG ECLOUD_LAUNCHER_JOB_ID="445974" 
ARG GOOGLE_INTEGRATION_VERSION="1.0.8"





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

RUN sed -i 's/24,0,7,1/24,0,7,11/' ${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
@@ -206,7 +206,8 @@ RUN sed -i 's/$this->changeAvatar/\/\/ $this->changeAvatar/' ${BASE_DIR}/custom_ 
RUN sed -i '/<step>OCA\\DAV\\Migration\\CalDAVRemoveEmptyValue<\/step>/d' ${BASE_DIR}/apps/dav/appinfo/info.xml



# Custom theme

RUN curl -fsSL -o eCloud-theme.tar.gz \

RUN rm -rf ${BASE_DIR}/themes/eCloud && \

    curl -fsSL -o eCloud-theme.tar.gz \

    "https://gitlab.e.foundation/e/infra/ecloud/nextcloud-apps/nextcloud-theme/-/archive/${THEME_VERSION}/nextcloud-theme-${THEME_VERSION}.tar.gz" && \

    tar -xf eCloud-theme.tar.gz -C /tmp/ && \

    mv /tmp/nextcloud-theme-${THEME_VERSION}/ ${BASE_DIR}/themes/eCloud && \