8000 Merge pull request #287 from reddexx/patch-5 · ZhaoUncle/docker-bookstack@ab3857a · GitHub
[go: up one dir, main page]
Skip to content

Commit ab3857a

Browse files
solidnerdsolidnerd
authored
Merge pull request solidnerd#287 from reddexx/patch-5
Update Dockerfile 21.11.3
2 parents fe6e51f + 40e765b commit ab3857a

File tree

4 files changed

+8
-7
lines changed

4 files changed

+8
-7
lines changed

‎.dockerignore

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,3 +2,5 @@ README.md
22
LICENCE
33
.git
44
docker-compose.yml
5+
Dockerfile
6+
.github

‎Dockerfile

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
FROM alpine:3 as bookstack
2-
ENV BOOKSTACK_VERSION=21.05.2
2+
ENV BOOKSTACK_VERSION=21.11.3
33
RUN apk add --no-cache curl tar
44
RUN set -x; \
55
curl -SL -o bookstack.tar.gz https://github.com/BookStackApp/BookStack/archive/v${BOOKSTACK_VERSION}.tar.gz \
66
&& mkdir -p /bookstack \
77
&& tar xvf bookstack.tar.gz -C /bookstack --strip-components=1 \
88
&& rm bookstack.tar.gz
99

10-
FROM php:7.4-apache-buster as final
10+
FROM php:8.0-apache-buster as final
1111
RUN set -x; \
1212
apt-get update \
1313
&& apt-get install -y --no-install-recommends \
@@ -51,13 +51,11 @@ COPY bookstack.conf /etc/apache2/sites-available/000-default.conf
5151

5252
COPY --from=bookstack --chown=33:33 /bookstack/ /var/www/bookstack/
5353

54-
ARG COMPOSER_VERSION=1.10.16
54+
ARG COMPOSER_VERSION=2.1.12
5555
RUN set -x; \
5656
cd /var/www/bookstack \
5757
&& curl -sS https://getcomposer.org/installer | php -- --version=$COMPOSER_VERSION \
58-
&& /var/www/bookstack/composer.phar global -v require hirak/prestissimo \
5958
&& /var/www/bookstack/composer.phar install -v -d /var/www/bookstack/ \
60-
&& /var/www/bookstack/composer.phar global -v remove hirak/prestissimo \
6159
&& rm -rf /var/www/bookstack/composer.phar /root/.composer \
6260
&& chown -R www-data:www-data /var/www/bookstack
6361

‎docker-compose.test.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ services:
66
depends_on:
77
- bookstack
88
mysql:
9-
image: mysql:5.7.33
9+
image: mysql:8.0
1010
environment:
1111
- MYSQL_ROOT_PASSWORD=secret
1212
- MYSQL_DATABASE=bookstack
@@ -20,6 +20,7 @@ services:
2020
depends_on:
2121
- mysql
2222
environment:
23+
- APP_URL=http://localhost:${DEV_PORT:-8080}
2324
- DB_HOST=mysql:3306
2425
- DB_DATABASE=bookstack
2526
- DB_USERNAME=bookstack

‎docker-compose.yml

Lines changed: 1 addition & 1 deletion
< 6B41 div data-testid="deletion diffstat" class="DiffSquares-module__diffSquare--h5kjy DiffSquares-module__deletion--hKV3q">
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
version: '2'
22
services:
33
mysql:
4-
image: mysql:5.7.33
4+
image: mysql:8.0
55
environment:
66
- MYSQL_ROOT_PASSWORD=secret
77
- MYSQL_DATABASE=bookstack

0 commit comments

Comments
 (0)
0