Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly
Appearance settings

Commit 2002fc4

Browse filesBrowse files
solidnerdsolidnerd
authored
Merge pull request solidnerd#25 from solidnerd/upgrade-to-0.15.0
Upgrade to 0.15.0
2 parents 2d3ec6d + aa44999 commit 2002fc4
Copy full SHA for 2002fc4

File tree

Expand file treeCollapse file tree

7 files changed

+34
-19
lines changed
Filter options
Expand file treeCollapse file tree

7 files changed

+34
-19
lines changed

‎Dockerfile

Copy file name to clipboard
+12-6Lines changed: 12 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
11
FROM php:7.0-apache
22

33
ENV BOOKSTACK=BookStack \
4-
BOOKSTACK_VERSION=0.14.3
4+
BOOKSTACK_VERSION=0.15.0 \
5+
BOOKSTACK_HOME="/var/www/bookstack"
56

67
RUN apt-get update && apt-get install -y git zlib1g-dev libfreetype6-dev libjpeg62-turbo-dev libmcrypt-dev libpng12-dev wget libldap2-dev libtidy-dev \
78
&& docker-php-ext-install pdo pdo_mysql mbstring zip tidy \
@@ -12,20 +13,24 @@ RUN apt-get update && apt-get install -y git zlib1g-dev libfreetype6-dev libjpeg
1213
&& cd /var/www && curl -sS https://getcomposer.org/installer | php \
1314
&& mv /var/www/composer.phar /usr/local/bin/composer \
1415
&& wget https://github.com/ssddanbrown/BookStack/archive/v${BOOKSTACK_VERSION}.tar.gz -O ${BOOKSTACK}.tar.gz \
15-
&& tar -xf ${BOOKSTACK}.tar.gz && mv BookStack-${BOOKSTACK_VERSION} ${BOOKSTACK} && rm ${BOOKSTACK}.tar.gz \
16-
&& cd /var/www/BookStack && composer install \
17-
&& chown -R www-data:www-data /var/www/BookStack \
16+
&& tar -xf ${BOOKSTACK}.tar.gz && mv BookStack-${BOOKSTACK_VERSION} ${BOOKSTACK_HOME} && rm ${BOOKSTACK}.tar.gz \
17+
&& cd $BOOKSTACK_HOME && composer install \
18+
&& chown -R www-data:www-data $BOOKSTACK_HOME \
1819
&& apt-get -y autoremove \
1920
&& apt-get clean \
20-
&& rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/* /etc/apache2/sites-enabled/000-*.conf
21+
&& rm -rf /var/lib/apt/lists/* /var/tmp/* /etc/apache2/sites-enabled/000-*.conf
2122

2223
COPY bookstack.conf /etc/apache2/sites-enabled/bookstack.conf
2324
RUN a2enmod rewrite
2425

2526
COPY docker-entrypoint.sh /
2627

28+
WORKDIR $BOOKSTACK_HOME
29+
2730
EXPOSE 80
2831

32+
VOLUME ["$BOOKSTACK_HOME/public/uploads","$BOOKSTACK_HOME/public/storage"]
33+
2934
ENTRYPOINT ["/docker-entrypoint.sh"]
3035

3136
ARG BUILD_DATE
@@ -34,7 +39,8 @@ LABEL org.label-schema.build-date=$BUILD_DATE \
3439
org.label-schema.docker.dockerfile="/Dockerfile" \
3540
org.label-schema.license="MIT" \
3641
org.label-schema.name="bookstack" \
42+
org.label-schema.vendor="solidnerd" \
3743
org.label-schema.url="https://github.com/solidnerd/docker-bookstack/" \
3844
org.label-schema.vcs-ref=$VCS_REF \
3945
org.label-schema.vcs-url="https://github.com/solidnerd/docker-bookstack.git" \
40-
org.label-schema.vcs-type="Git"
46+
org.label-schema.vcs-type="Git"

‎README.md

Copy file name to clipboardExpand all lines: README.md
+3-3Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
[![](https://images.microbadger.com/badges/image/solidnerd/bookstack.svg)](https://microbadger.com/images/solidnerd/bookstack "Get your own image badge on microbadger.com") [![](https://images.microbadger.com/badges/commit/solidnerd/bookstack.svg)](https://microbadger.com/images/solidnerd/bookstack "Get your own commit badge on microbadger.com") [![](https://images.microbadger.com/badges/version/solidnerd/bookstack.svg)](https://microbadger.com/images/solidnerd/bookstack "Get your own version badge on microbadger.com") [![](https://images.microbadger.com/badges/license/solidnerd/bookstack.svg)](https://microbadger.com/images/solidnerd/bookstack "Get your own license badge on microbadger.com")
44

5-
## Current Version: [0.14.3](https://github.com/SolidNerd/docker-bookstack/blob/master/Dockerfile)
5+
## Current Version: [0.15.0](https://github.com/SolidNerd/docker-bookstack/blob/master/Dockerfile)
66

77
### Changes
88
In 0.12.2 we removed `DB_PORT` . You can now specify the port via `DB_HOST` like `DB_HOST=mysql:3306`
@@ -31,7 +31,7 @@ docker run -d --name bookstack-mysql -p 3306:3306 -e MYSQL_ROOT_PASSWORD=secret
3131
```
3232
2. BookStack Container:
3333
```bash
34-
docker run --name my-bookstack -d --link bookstack-mysql:mysql -p 8080:80 solidnerd/bookstack:0.14.3
34+
docker run --name my-bookstack -d --link bookstack-mysql:mysql -p 8080:80 solidnerd/bookstack:0.15.0
3535
```
3636

3737
### #Docker 1.9+
@@ -58,7 +58,7 @@ docker run -d --net bookstack_nw \
5858
-e DB_USERNAME=bookstack \
5959
-e DB_PASSWORD=secret \
6060
-p 8080:80 \
61-
solidnerd/bookstack:0.14.3
61+
solidnerd/bookstack:0.15.0
6262
```
6363

6464
After the steps you can visit [http://localhost:8080](http://localhost:8080) . You can login with username 'admin@admin.com' and password 'password'.

‎VERSION

Copy file name to clipboard
+1-1Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
0.14.3
1+
0.15.0

‎bookstack.conf

Copy file name to clipboardExpand all lines: bookstack.conf
+2-2Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
<VirtualHost *:80>
22
ServerName bookstack.dev
3-
DocumentRoot "/var/www/BookStack/public/"
3+
DocumentRoot "/var/www/bookstack/public/"
44

5-
<Directory "/var/www/BookStack/">
5+
<Directory "/var/www/bookstack/">
66
Options FollowSymLinks MultiViews
77
AllowOverride All
88
Require all granted

‎docker-compose.yml

Copy file name to clipboardExpand all lines: docker-compose.yml
+2-2Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ services:
1212
- mysql-data:/var/lib/mysql
1313

1414
bookstack:
15-
image: solidnerd/bookstack:0.14.3
15+
image: solidnerd/bookstack:0.15.0
1616
depends_on:
1717
- mysql
1818
environment:
@@ -29,4 +29,4 @@ services:
2929
volumes:
3030
mysql-data:
3131
uploads:
32-
storage-uploads:
32+
storage-uploads:

‎docker-entrypoint.sh

Copy file name to clipboardExpand all lines: docker-entrypoint.sh
+9-5Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -79,6 +79,7 @@ if [ ! -f '/var/www/BookStack/.env' ]; then
7979
MAIL_ENCRYPTION=${MAIL_ENCRYPTION:-null}
8080
# URL used for social login redirects, NO TRAILING SLASH
8181
EOF
82+
sed -ie "s/single/errorlog/g" config/app.php
8283
else
8384
echo >&2 'error: missing DB_HOST environment variable'
8485
exit 1
@@ -102,16 +103,19 @@ else
102103
echoerr wait-for-db: timeout out after 15 seconds waiting for ${DB_HOST_NAME}:${DB_PORT}
103104
fi
104105

105-
cd /var/www/BookStack/ && php artisan key:generate && php artisan migrate --force
106+
composer install
106107

108+
php artisan key:generate
109+
110+
php artisan migrate --force
107111

108-
echo "Setting folder permissions for uploads"
109-
chown -R www-data:www-data /var/www/BookStack/public/uploads && chmod -R 775 /var/www/BookStack/public/uploads
110-
chown -R www-data:www-data /var/www/BookStack/storage/uploads && chmod -R 775 /var/www/BookStack/storage/uploads
111112

112-
echo "Clear Cache..."
113+
echo "Setting folder permissions for uploads"
114+
chown -R www-data:www-data public/uploads && chmod -R 775 public/uploads
115+
chown -R www-data:www-data storage/uploads && chmod -R 775 storage/uploads
113116

114117
php artisan cache:clear
118+
115119
php artisan view:clear
116120

117121
exec apache2-foreground

‎hooks/post_push

Copy file name to clipboard
+5Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
#!/bin/bash
2+
set -e
3+
4+
docker tag $IMAGE_NAME $DOCKER_REPO:latest
5+
docker push $DOCKER_REPO:latest

0 commit comments

Comments
0 (0)
Morty Proxy This is a proxified and sanitized view of the page, visit original site.