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

Commit 5bbf4668 authored by Akhil's avatar Akhil 🙂
Browse files

Copy over php to nc instead of nc to php

parent e22526f9
Loading
Loading
Loading
Loading
Loading
+8 −10
Original line number Diff line number Diff line
FROM nextcloud:21.0.7-fpm AS nextcloud
FROM php:8.0.12-fpm-bullseye as php8

FROM nextcloud:21.0.7-fpm
ARG BASE_DIR="/usr/src/nextcloud"
ARG TMP_PATCH_DIR="/tmp/build_patches"
ARG THEME_VERSION="20.1.2"
@@ -16,7 +18,12 @@ ARG EDA_TAG="nc-21"
ARG ECLOUD_LAUNCHER_JOB_ID="208960"
ARG GOOGLE_INTEGRATION_VERSION="1.0.6-1-nightly"

COPY --from=php8 /usr/local/ /usr/local/

RUN mkdir -p /var/www/skeleton/Documents && mkdir -p /var/www/skeleton/Images
COPY patches/ ${TMP_PATCH_DIR}/
COPY custom_entrypoint.sh /
RUN chmod +x /custom_entrypoint.sh
RUN sed -i 's/21,0,7,1/21,0,7,1/' ${BASE_DIR}/version.php

# Install unzip for unzipping artifacts
@@ -141,14 +148,5 @@ RUN curl -fsSL -o eCloud-theme.tar.gz \
# Replace "Get your own free account" NC link with /e/ Account link in public pages
RUN sed -i 's/https:\/\/nextcloud.com\/signup\//https:\/\/e\.foundation\/<?php p(\$_\[\x27language\x27\]); ?>\/e-email-invite\//' ${BASE_DIR}/core/templates/layout.public.php 

FROM php:8.0.12-fpm-bullseye
RUN mkdir -p /var/www/skeleton/Documents && mkdir -p /var/www/skeleton/Images
COPY --from=nextcloud /usr/src/nextcloud /usr/src/nextcloud

COPY custom_entrypoint.sh /
COPY --from=nextcloud /entrypoint.sh /
RUN chmod +x /custom_entrypoint.sh
RUN chmod +x /entrypoint.sh

ENTRYPOINT ["/custom_entrypoint.sh"]
CMD ["php-fpm"]