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

Unverified Commit a05bb725 authored by Akhil's avatar Akhil 🙂
Browse files

Bump version, move lws down

parent 3085e50b
Loading
Loading
Loading
Loading
Loading
+7 −6
Original line number Diff line number Diff line
@@ -15,9 +15,8 @@ ARG RAINLOOP_COMMIT_SHA="523518ba"
ARG EA_TAG="2.1.0"
ARG ECLOUD_LAUNCHER_JOB_ID="345049"
ARG GOOGLE_INTEGRATION_VERSION="1.0.8"
ARG LDAP_WRITE_SUPPORT_VERSION="1.4.0"

RUN sed -i 's/22,2,10,2/22,2,10,10/' ${BASE_DIR}/version.php
RUN sed -i 's/22,2,10,2/22,2,10,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
@@ -96,10 +95,6 @@ RUN curl -fsSL -o ecloud-accounts.tar.gz \
    mv "${BASE_DIR}/custom_apps/ecloud-accounts-${EA_TAG}" "${BASE_DIR}/custom_apps/ecloud-accounts" && \
    rm ecloud-accounts.tar.gz;

RUN curl -fsSL -o ldap_write_support.tar.gz \
    "https://github.com/nextcloud-releases/ldap_write_support/releases/download/v${LDAP_WRITE_SUPPORT_VERSION}/ldap_write_support.tar.gz" && \
    tar -xf ldap_write_support.tar.gz -C ${BASE_DIR}/custom_apps && \
    rm ldap_write_support.tar.gz

# Remove unzip when unzipping is done
RUN apt-get -y remove unzip
@@ -164,6 +159,7 @@ RUN rm -rf ${TMP_PATCH_DIR}
From selfhost as ecloud
ARG BASE_DIR="/usr/src/nextcloud"
ARG TMP_PATCH_DIR="/tmp/build_patches"
ARG LDAP_WRITE_SUPPORT_VERSION="1.4.0"

# Patches
COPY patches/ ${TMP_PATCH_DIR}/
@@ -181,3 +177,8 @@ RUN cd ${BASE_DIR}/custom_apps/calendar && sed -i 's/"GROUP","INDIVIDUAL"/"INDIV
RUN cd ${BASE_DIR}/custom_apps/calendar && sed -i 's/{name:\[a,"displayname"\]},//' js/calendar-main.js
# Set default widgets to calendar, tasks and notes
RUN sed -i 's/recommendations,spreed,mail,calendar/calendar,tasks,notes/' ${BASE_DIR}/apps/dashboard/lib/Controller/DashboardController.php

RUN curl -fsSL -o ldap_write_support.tar.gz \
    "https://github.com/nextcloud-releases/ldap_write_support/releases/download/v${LDAP_WRITE_SUPPORT_VERSION}/ldap_write_support.tar.gz" && \
    tar -xf ldap_write_support.tar.gz -C ${BASE_DIR}/custom_apps && \
    rm ldap_write_support.tar.gz
 No newline at end of file