From a6625c984ecec3a9f2633ed18ea41b3d82914933 Mon Sep 17 00:00:00 2001 From: soneill Date: Sat, 18 Sep 2021 16:30:46 +1200 Subject: [PATCH 1/3] .gitignore: adds .production backups --- .gitignore | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index 95fa36d..48ec249 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,5 @@ .env .vscode -letsencrypt \ No newline at end of file +letsencrypt +*.production* +static/php/xdebug.ini \ No newline at end of file From e7e7b61809acb6be0a10f4816c2ef51307267d50 Mon Sep 17 00:00:00 2001 From: soneill Date: Sat, 18 Sep 2021 16:31:22 +1200 Subject: [PATCH 2/3] Dockerfile: Updates Composer version --- Dockerfile | 2 +- development/Dockerfile.development | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index 1705370..f76d0c2 100644 --- a/Dockerfile +++ b/Dockerfile @@ -9,7 +9,7 @@ RUN apk update \ COPY pathfinder /app WORKDIR /app -RUN composer self-update 1.6.3 +RUN composer self-update 2.1.8 RUN composer install FROM trafex/alpine-nginx-php7:ba1dd422 diff --git a/development/Dockerfile.development b/development/Dockerfile.development index 090f40f..8fe1dd6 100644 --- a/development/Dockerfile.development +++ b/development/Dockerfile.development @@ -9,7 +9,7 @@ RUN apk update \ COPY pathfinder /app WORKDIR /app -RUN composer self-update 1.6.3 +RUN composer self-update 2.1.8 RUN composer install FROM trafex/alpine-nginx-php7:ba1dd422 From 632858fa02c14883bee32c64e6fa797ce0102d5f Mon Sep 17 00:00:00 2001 From: soneill Date: Sat, 18 Sep 2021 22:39:36 +1200 Subject: [PATCH 3/3] Bump Pathfinder version to v2.1.2 --- config/pathfinder/pathfinder.ini | 4 ++-- pathfinder | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/config/pathfinder/pathfinder.ini b/config/pathfinder/pathfinder.ini index 995c445..10d9950 100644 --- a/config/pathfinder/pathfinder.ini +++ b/config/pathfinder/pathfinder.ini @@ -13,8 +13,8 @@ NAME = Pathfinder Community Edition ; Version is used for CSS/JS cache busting and is part of the URL for static resources: ; e.g. public/js/vX.X.X/app.js ; Syntax: String (current version) -; Default: v2.1.1 -VERSION = v2.1.1 +; Default: v2.1.2 +VERSION = v2.1.2 ; Contact information [optional] ; Shown on 'licence', 'contact' page. diff --git a/pathfinder b/pathfinder index ce6157e..4607d51 160000 --- a/pathfinder +++ b/pathfinder @@ -1 +1 @@ -Subproject commit ce6157ed54aca7019b2418990a3fd54ef093481c +Subproject commit 4607d5144a87abdf73d7e37e2235cbcf39d12d8c