From 634335ac747607f17f82e5ae9df71bff4ac13120 Mon Sep 17 00:00:00 2001 From: Florent VINCENT Date: Tue, 6 Jun 2023 08:12:08 +0000 Subject: [PATCH 1/6] Update Dockerfile to add ffmpeg via apt packages --- Dockerfile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index d8472d4f..3690dbc9 100644 --- a/Dockerfile +++ b/Dockerfile @@ -18,7 +18,8 @@ COPY custom_entrypoint.sh / RUN chmod +x /custom_entrypoint.sh RUN mkdir -p /var/www/skeleton/Documents && mkdir -p /var/www/skeleton/Images # Install unzip for unzipping artifacts -RUN apt-get update && apt-get install unzip +# Install ffmpeg for video preview generation +RUN apt-get update && apt-get install unzip ffmpeg RUN curl -fsSL -o notes.tar.gz \ "https://github.com/nextcloud/notes/releases/download/v${NOTES_VERSION}/notes.tar.gz" && \ -- GitLab From 349c0ac1af895e74cafa7493355067a8dd3cca99 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Arnau=20V=C3=A0zquez?= Date: Tue, 6 Jun 2023 09:34:52 +0000 Subject: [PATCH 2/6] non-interactive install --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 3690dbc9..5f7d9983 100644 --- a/Dockerfile +++ b/Dockerfile @@ -19,7 +19,7 @@ RUN chmod +x /custom_entrypoint.sh RUN mkdir -p /var/www/skeleton/Documents && mkdir -p /var/www/skeleton/Images # Install unzip for unzipping artifacts # Install ffmpeg for video preview generation -RUN apt-get update && apt-get install unzip ffmpeg +RUN apt-get update && apt-get install -y unzip ffmpeg RUN curl -fsSL -o notes.tar.gz \ "https://github.com/nextcloud/notes/releases/download/v${NOTES_VERSION}/notes.tar.gz" && \ -- GitLab From 3f66dbb292deca896d93df96e7adc3218644ddc5 Mon Sep 17 00:00:00 2001 From: Akhil Date: Thu, 8 Jun 2023 18:53:30 +0530 Subject: [PATCH 3/6] Update app job ids --- Dockerfile | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/Dockerfile b/Dockerfile index 5f7d9983..20be1600 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,16 +1,16 @@ FROM nextcloud:25.0.6-fpm AS nextcloud ARG BASE_DIR="/usr/src/nextcloud" ARG TMP_PATCH_DIR="/tmp/build_patches" -ARG THEME_HELPER_JOB_ID="583519" +ARG THEME_HELPER_JOB_ID="602630" ARG NOTES_VERSION="4.7.2" ARG CONTACTS_JOB_ID="582012" ARG CALENDAR_JOB_ID="582001" ARG EMAIL_RECOVERY_JOB_ID="582038" -ARG EA_JOB_ID="582028" -ARG LAUNCHER_JOB_ID="582666" +ARG EA_JOB_ID="608598" +ARG LAUNCHER_JOB_ID="608837" ARG GOOGLE_INTEGRATION_VERSION="1.0.9" -ARG DASHBOARD_JOB_ID="582062" -ARG SNAPPY_VERSION="2.27.2" +ARG DASHBOARD_JOB_ID="608827" +ARG SNAPPY_VERSION="2.28.1" ARG SNAPPY_THEME_VERSION="2.0.0" RUN sed -i 's/25,0,6,1/25,0,6,5/' ${BASE_DIR}/version.php @@ -159,7 +159,7 @@ RUN sed -i 's/this.appLimit=e/this.appLimit=this.appList.length/' ${BASE_DIR}/di From selfhost as ecloud ARG BASE_DIR="/usr/src/nextcloud" ARG TMP_PATCH_DIR="/tmp/build_patches" -ARG THEME_VERSION="25.0.6" +ARG THEME_VERSION="25.0.11" ARG LDAP_WRITE_SUPPORT_VERSION="1.7.0" ARG OIDC_LOGIN_VERSION="2.5.1" -- GitLab From 715459c0d2791c231d1c0d9012182df6ebc4bb5a Mon Sep 17 00:00:00 2001 From: Nivesh Krishna Date: Fri, 9 Jun 2023 09:31:22 +0000 Subject: [PATCH 4/6] Apply 1 suggestion(s) to 1 file(s) --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 20be1600..a662cc56 100644 --- a/Dockerfile +++ b/Dockerfile @@ -11,7 +11,7 @@ ARG LAUNCHER_JOB_ID="608837" ARG GOOGLE_INTEGRATION_VERSION="1.0.9" ARG DASHBOARD_JOB_ID="608827" ARG SNAPPY_VERSION="2.28.1" -ARG SNAPPY_THEME_VERSION="2.0.0" +ARG SNAPPY_THEME_VERSION="2.0.3" RUN sed -i 's/25,0,6,1/25,0,6,5/' ${BASE_DIR}/version.php COPY custom_entrypoint.sh / -- GitLab From 56ba85f2c24b41e60680e2a24717296740214cd9 Mon Sep 17 00:00:00 2001 From: diroots Date: Mon, 24 Jul 2023 13:44:23 +0200 Subject: [PATCH 5/6] add ffmpeg with apt --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index b87db1c7..b05939fc 100644 --- a/Dockerfile +++ b/Dockerfile @@ -20,7 +20,7 @@ COPY custom_entrypoint.sh / RUN chmod +x /custom_entrypoint.sh RUN mkdir -p /var/www/skeleton/Documents && mkdir -p /var/www/skeleton/Images # Install unzip for unzipping artifacts -RUN apt-get update && apt-get install unzip +RUN apt-get update && apt-get install unzip ffmpeg RUN curl -fsSL -o notes.tar.gz \ "https://github.com/nextcloud/notes/releases/download/v${NOTES_VERSION}/notes.tar.gz" && \ -- GitLab From 5561a149bd07d53be37fb6a950af0e682d3b6dd0 Mon Sep 17 00:00:00 2001 From: diroots Date: Mon, 24 Jul 2023 13:49:28 +0200 Subject: [PATCH 6/6] force yes in apt for ffmpeg dependencies --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index b05939fc..4e4d2c91 100644 --- a/Dockerfile +++ b/Dockerfile @@ -20,7 +20,7 @@ COPY custom_entrypoint.sh / RUN chmod +x /custom_entrypoint.sh RUN mkdir -p /var/www/skeleton/Documents && mkdir -p /var/www/skeleton/Images # Install unzip for unzipping artifacts -RUN apt-get update && apt-get install unzip ffmpeg +RUN apt-get update && apt-get install -y unzip ffmpeg RUN curl -fsSL -o notes.tar.gz \ "https://github.com/nextcloud/notes/releases/download/v${NOTES_VERSION}/notes.tar.gz" && \ -- GitLab