Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
FROM alpine:3 as bookstack
ENV BOOKSTACK_VERSION=0.29.3
ENV BOOKSTACK_VERSION=0.30.2
RUN apk add --no-cache curl tar
RUN set -x; \
curl -SL -o bookstack.tar.gz https://github.com/BookStackApp/BookStack/archive/v${BOOKSTACK_VERSION}.tar.gz \
Expand Down Expand Up @@ -32,7 +32,7 @@ RUN set -x; \
&& docker-php-ext-configure ldap \
&& docker-php-ext-install -j$(nproc) ldap \
&& docker-php-ext-configure gd --with-freetype=/usr/include/ --with-jpeg=/usr/include/ \
&& docker-php-ext-install -j$(nproc) gd
&& docker-php-ext-install -j$(nproc) gd

RUN a2enmod rewrite remoteip; \
{ \
Expand All @@ -45,7 +45,7 @@ RUN a2enmod rewrite remoteip; \

RUN set -ex; \
sed -i "s/Listen 80/Listen 8080/" /etc/apache2/ports.conf; \
sed -i "s/VirtualHost *:80/VirtualHost *:8080/" /etc/apache2/sites-available/*.conf
sed -i "s/VirtualHost *:80/VirtualHost *:8080/" /etc/apache2/sites-available/*.conf

COPY bookstack.conf /etc/apache2/sites-available/000-default.conf

Expand Down
10 changes: 5 additions & 5 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

[![Build Status](https://travis-ci.org/solidnerd/docker-bookstack.svg?branch=master)](https://travis-ci.org/solidnerd/docker-bookstack) [![](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")

## Current Version: [0.29.3](https://github.com/SolidNerd/docker-bookstack/blob/master/Dockerfile)
## Current Version: [0.30.2](https://github.com/SolidNerd/docker-bookstack/blob/master/Dockerfile)

### Changes

Expand Down Expand Up @@ -49,8 +49,8 @@ mysql:5.7.21
```bash
docker run -d --link bookstack_db_:mysql \
-p 8080:8080 \
--name bookstack_0.29.3 \
solidnerd/bookstack:0.29.3
--name bookstack_0.30.2 \
solidnerd/bookstack:0.30.2
```

#### Docker 1.9+
Expand Down Expand Up @@ -82,8 +82,8 @@ docker run -d --net bookstack_nw \
-e DB_USERNAME=bookstack \
-e DB_PASSWORD=secret \
-p 8080:8080 \
--name="bookstack_0.29.3" \
solidnerd/bookstack:0.29.3
--name="bookstack_0.30.2" \
solidnerd/bookstack:0.30.2
```

#### Volumes
Expand Down
2 changes: 1 addition & 1 deletion VERSION
Original file line number Diff line number Diff line change
@@ -1 +1 @@
0.29.3
0.30.2
2 changes: 1 addition & 1 deletion docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ services:
- mysql-data:/var/lib/mysql

bookstack:
image: solidnerd/bookstack:0.29.3
image: solidnerd/bookstack:0.30.2
depends_on:
- mysql
environment:
Expand Down