affine/pathfinder-containers
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #10 from goryn-clade/develop

Browse source 
Merge Develop
This commit is contained in:
Sam 2021-09-18 12:42:41 +02:00 • committed by GitHub
commit 0da27f6103
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
5 changed files with 8 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

2
.gitignore vendored
View file

@ -1,3 +1,5 @@
.env .env
.vscode .vscode
letsencrypt letsencrypt
*.production*
static/php/xdebug.ini

2
Dockerfile
View file

@ -9,7 +9,7 @@ RUN apk update \
COPY pathfinder /app COPY pathfinder /app
WORKDIR /app WORKDIR /app
RUN composer self-update 1.6.3 RUN composer self-update 2.1.8
RUN composer install RUN composer install
FROM trafex/alpine-nginx-php7:ba1dd422 FROM trafex/alpine-nginx-php7:ba1dd422

4
config/pathfinder/pathfinder.ini
View file

@ -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: ; 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 ; e.g. public/js/vX.X.X/app.js
; Syntax: String (current version) ; Syntax: String (current version)
; Default: v2.1.1 ; Default: v2.1.2
VERSION = v2.1.1 VERSION = v2.1.2
; Contact information [optional] ; Contact information [optional]
; Shown on 'licence', 'contact' page. ; Shown on 'licence', 'contact' page.

2
development/Dockerfile.development
View file

@ -9,7 +9,7 @@ RUN apk update \
COPY pathfinder /app COPY pathfinder /app
WORKDIR /app WORKDIR /app
RUN composer self-update 1.6.3 RUN composer self-update 2.1.8
RUN composer install RUN composer install
FROM trafex/alpine-nginx-php7:ba1dd422 FROM trafex/alpine-nginx-php7:ba1dd422

2
pathfinder

@ -1 +1 @@
Subproject commit ce6157ed54aca7019b2418990a3fd54ef093481c Subproject commit 4607d5144a87abdf73d7e37e2235cbcf39d12d8c