Update to 0.30.0
- Bump to Alpine 3.12 - Bump MariaDB to 10.5
This commit is contained in:
parent
c0c1f12a18
commit
081fbc8d33
|
|
@ -1,15 +1,14 @@
|
||||||
FROM alpine:3.11
|
FROM alpine:3.12
|
||||||
|
|
||||||
LABEL maintainer="JJTC <oci@jjtc.eu>"
|
LABEL maintainer="JJTC <oci@jjtc.eu>"
|
||||||
|
|
||||||
ENV PPM_VERSION=2.1.3 \
|
ENV PPM_VERSION=2.1.3 \
|
||||||
PPM_HTTP_VERSION=2.0.6 \
|
PPM_HTTP_VERSION=2.0.6 \
|
||||||
BOOKSTACK=BookStack \
|
BOOKSTACK=BookStack \
|
||||||
BOOKSTACK_VERSION=0.29.2 \
|
BOOKSTACK_VERSION=0.30.0 \
|
||||||
BOOKSTACK_HOME="/app"
|
BOOKSTACK_HOME="/app"
|
||||||
|
|
||||||
COPY entrypoint.sh /app/entrypoint.sh
|
COPY entrypoint.sh /app/entrypoint.sh
|
||||||
COPY file_validation.patch /app/file_validation.patch
|
|
||||||
|
|
||||||
RUN set -ex \
|
RUN set -ex \
|
||||||
&& chmod +x /app/entrypoint.sh \
|
&& chmod +x /app/entrypoint.sh \
|
||||||
|
|
@ -71,8 +70,6 @@ RUN set -ex \
|
||||||
&& tar --strip-components=1 -xzf BookStack-${BOOKSTACK_VERSION}.tar.gz \
|
&& tar --strip-components=1 -xzf BookStack-${BOOKSTACK_VERSION}.tar.gz \
|
||||||
&& rm -rf ${BOOKSTACK}-${BOOKSTACK_VERSION}.tar.gz .env.example .env.example.complete .gitattributes .github .gitignore .travis.yml tests/ public/index.php \
|
&& rm -rf ${BOOKSTACK}-${BOOKSTACK_VERSION}.tar.gz .env.example .env.example.complete .gitattributes .github .gitignore .travis.yml tests/ public/index.php \
|
||||||
&& ln -s init.php bootstrap/autoload.php \
|
&& ln -s init.php bootstrap/autoload.php \
|
||||||
&& patch -p1 < file_validation.patch \
|
|
||||||
&& rm file_validation.patch \
|
|
||||||
&& echo "Get Dependencies:" \
|
&& echo "Get Dependencies:" \
|
||||||
&& composer install \
|
&& composer install \
|
||||||
&& echo "Changing ownership:" \
|
&& echo "Changing ownership:" \
|
||||||
|
|
|
||||||
|
|
@ -1,21 +0,0 @@
|
||||||
--- a/app/Http/Controllers/AttachmentController.php
|
|
||||||
+++ b/app/Http/Controllers/AttachmentController.php
|
|
||||||
@@ -37,7 +37,7 @@ class AttachmentController extends Controller
|
|
||||||
{
|
|
||||||
$this->validate($request, [
|
|
||||||
'uploaded_to' => 'required|integer|exists:pages,id',
|
|
||||||
- 'file' => 'required|file'
|
|
||||||
+ 'file' => 'required'
|
|
||||||
]);
|
|
||||||
|
|
||||||
$pageId = $request->get('uploaded_to');
|
|
||||||
@@ -66,7 +66,7 @@ class AttachmentController extends Controller
|
|
||||||
{
|
|
||||||
$this->validate($request, [
|
|
||||||
'uploaded_to' => 'required|integer|exists:pages,id',
|
|
||||||
- 'file' => 'required|file'
|
|
||||||
+ 'file' => 'required'
|
|
||||||
]);
|
|
||||||
|
|
||||||
$pageId = $request->get('uploaded_to');
|
|
||||||
|
|
||||||
|
|
@ -1,7 +1,7 @@
|
||||||
version: '3.7'
|
version: '3.7'
|
||||||
services:
|
services:
|
||||||
db:
|
db:
|
||||||
image: mariadb:10.4
|
image: mariadb:10.5
|
||||||
restart: unless-stopped
|
restart: unless-stopped
|
||||||
environment:
|
environment:
|
||||||
- TZ=${TZ}
|
- TZ=${TZ}
|
||||||
|
|
@ -25,7 +25,7 @@ services:
|
||||||
- backend
|
- backend
|
||||||
|
|
||||||
app:
|
app:
|
||||||
image: jjtc/bookstack-ppm:0.29.0-r0
|
image: jjtc/bookstack-ppm:0.30.0-r0
|
||||||
build: ./app/
|
build: ./app/
|
||||||
restart: unless-stopped
|
restart: unless-stopped
|
||||||
depends_on:
|
depends_on:
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue