From 79ef9f5d228315df5d974f2f2fa0fba321826478 Mon Sep 17 00:00:00 2001 From: grasdk <115414609+grasdk@users.noreply.github.com> Date: Fri, 25 Oct 2024 19:55:47 +0200 Subject: [PATCH] Updated versions to match Galette 1.1.4 (#27) --- CONTRIBUTING.md | 1 + Dockerfile | 18 ++++++++++++------ 2 files changed, 13 insertions(+), 6 deletions(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 3ff6432..82992da 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -71,6 +71,7 @@ Follow the instructions above, but add any or both of these build args to the bu --build-arg PLUGIN_MAPS_VERSION=dev \ --build-arg PLUGIN_OBJECTSLEND_VERSION=dev \ --build-arg PLUGIN_PAYPAL_VERSION=dev \ + --build-arg PLUGIN_ACTIVITIES_VERSION=dev \ --load . ``` diff --git a/Dockerfile b/Dockerfile index 14e5731..75c430c 100644 --- a/Dockerfile +++ b/Dockerfile @@ -3,7 +3,7 @@ ARG PHP_VERSION=8.2 # Using PHP-Apache image FROM php:${PHP_VERSION}-apache ARG PHP_VERSION -ARG GALETTE_VERSION=1.1.3 +ARG GALETTE_VERSION=1.1.4 ARG GALETTE_RELEASE=galette-${GALETTE_VERSION} # Maintained by GrasDK for Galette community @@ -13,12 +13,13 @@ LABEL maintainer="GrasDK" ## Plugins versions -ARG PLUGIN_AUTO_VERSION="2.1.1" -ARG PLUGIN_EVENTS_VERSION="2.1.2" +ARG PLUGIN_AUTO_VERSION="2.1.3" +ARG PLUGIN_EVENTS_VERSION="2.1.3" ARG PLUGIN_FULLCARD_VERSION="2.1.0" -ARG PLUGIN_MAPS_VERSION="2.1.0" -ARG PLUGIN_OBJECTSLEND_VERSION="2.1.1" -ARG PLUGIN_PAYPAL_VERSION="2.1.1" +ARG PLUGIN_MAPS_VERSION="2.1.2" +ARG PLUGIN_OBJECTSLEND_VERSION="2.1.2" +ARG PLUGIN_PAYPAL_VERSION="2.1.2" +ARG PLUGIN_ACTIVITIES_VERSION="1.0.4" LABEL description="PHP $PHP_VERSION / Apache 2 / $GALETTE_RELEASE" @@ -109,6 +110,11 @@ RUN tar jxvf galette-plugin-objectslend-${PLUGIN_OBJECTSLEND_VERSION}.tar.bz2; r RUN wget --progress=dot:giga ${PLUGIN_PACKAGE_URL}galette-plugin-paypal-${PLUGIN_PAYPAL_VERSION}.tar.bz2 RUN tar jxvf galette-plugin-paypal-${PLUGIN_PAYPAL_VERSION}.tar.bz2; rm galette-plugin-paypal-${PLUGIN_PAYPAL_VERSION}.tar.bz2; mv galette-plugin-paypal-${PLUGIN_PAYPAL_VERSION} plugin-paypal +### Activities +RUN wget --progress=dot:giga ${PLUGIN_PACKAGE_URL}galette-plugin-activities-${PLUGIN_ACTIVITIES_VERSION}.tar.bz2 +RUN tar jxvf galette-plugin-activities-${PLUGIN_ACTIVITIES_VERSION}.tar.bz2; rm galette-plugin-activities-${PLUGIN_ACTIVITIES_VERSION}.tar.bz2; mv galette-plugin-activities-${PLUGIN_ACTIVITIES_VERSION} plugin-activities + + # CRON Auto-Reminder ## Copy galette-cron file to the cron.d directory COPY galette-cron /etc/cron.d/galette-cron