diff --git a/Dockerfile b/Dockerfile index 7e4abe847b1392f80abb505983f11cae1988263e..75f87df89597582a6a7049c7cca4178483c702e4 100644 --- a/Dockerfile +++ b/Dockerfile @@ -7,7 +7,7 @@ ARG NEWS_VERSION="18.0.1" ARG QUOTA_WARN_VERSION="1.14.0" ARG NOTES_VERSION="4.3.1" ARG CONTACTS_VERSION="4.1.0" -ARG CALENDAR_VERSION="3.2.2" +ARG CALENDAR_JOB_ID="302994" ARG USER_BACKEND_RAW_SQL_VERSION="1.1.1" ARG EMAIL_RECOVERY_JOB_ID="294828" ARG RAINLOOP_VERSION="7.2.5" @@ -16,7 +16,7 @@ ARG EA_TAG="1.2.0" ARG ECLOUD_LAUNCHER_JOB_ID="294845" ARG GOOGLE_INTEGRATION_VERSION="1.0.6" -RUN sed -i 's/22,2,7,1/22,2,7,3/' ${BASE_DIR}/version.php +RUN sed -i 's/22,2,7,1/22,2,7,4/' ${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 @@ -44,10 +44,12 @@ RUN curl -fsSL -o contacts.tar.gz \ tar -xf contacts.tar.gz -C ${BASE_DIR}/custom_apps/ && \ rm contacts.tar.gz; -RUN curl -fsSL -o calendar.tar.gz \ - "https://github.com/nextcloud-releases/calendar/releases/download/v${CALENDAR_VERSION}/calendar-v${CALENDAR_VERSION}.tar.gz" && \ - tar -xf calendar.tar.gz -C ${BASE_DIR}/custom_apps/ && \ - rm calendar.tar.gz; +# custom Calendar 3.2.3 +RUN curl -fsSL -o calendar.zip \ + "https://gitlab.e.foundation/e/infra/selfhost/nextcloud-apps/calendar/-/jobs/${CALENDAR_JOB_ID}/artifacts/download" && \ + unzip calendar.zip && \ + mv dist/calendar ${BASE_DIR}/custom_apps/ && \ + rm calendar.zip; RUN curl -fsSL -o user_backend_sql_raw.tar.gz \ "https://github.com/PanCakeConnaisseur/user_backend_sql_raw/releases/download/v${USER_BACKEND_RAW_SQL_VERSION}/user_backend_sql_raw.tar.gz" && \ @@ -144,4 +146,4 @@ RUN curl -fsSL -o eCloud-theme.tar.gz \ RUN sed -i 's/https:\/\/nextcloud.com\/signup\//https:\/\/e\.foundation\/\/e-email-invite\//' ${BASE_DIR}/core/templates/layout.public.php ENTRYPOINT ["/custom_entrypoint.sh"] -CMD ["php-fpm"] \ No newline at end of file +CMD ["php-fpm"]