Skip to content

BookStack update, storage path fix and new env variables. #135

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 3 commits into from
Closed

BookStack update, storage path fix and new env variables. #135

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
55a96e1
BookStack update to 0.26.1.
antontkv May 18, 2019
aa51856
Fix storage path for uploaded files.
antontkv May 18, 2019
864f4e6
Added language variables and moved php.ini configuration to compose f…
antontkv May 19, 2019
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
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
FROM php:7.1-apache-stretch

ENV BOOKSTACK=BookStack \
BOOKSTACK_VERSION=0.25.2 \
BOOKSTACK_VERSION=0.26.1 \
BOOKSTACK_HOME="/var/www/bookstack"

RUN apt-get update && apt-get install -y git zlib1g-dev libfreetype6-dev libjpeg62-turbo-dev libmcrypt-dev libpng-dev wget libldap2-dev libtidy-dev \
Expand All @@ -20,7 +20,7 @@ RUN apt-get update && apt-get install -y git zlib1g-dev libfreetype6-dev libjpeg
&& apt-get clean \
&& rm -rf /var/lib/apt/lists/* /var/tmp/* /etc/apache2/sites-enabled/000-*.conf

COPY php.ini /usr/local/etc/php/php.ini

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

Expand All @@ -30,7 +30,7 @@ WORKDIR $BOOKSTACK_HOME

EXPOSE 80

VOLUME ["$BOOKSTACK_HOME/public/uploads","$BOOKSTACK_HOME/public/storage"]
VOLUME ["$BOOKSTACK_HOME/public/uploads","$BOOKSTACK_HOME/storage/uploads"]

ENTRYPOINT ["/docker-entrypoint.sh"]

Expand Down
4 changes: 2 additions & 2 deletions docker-compose.yml
View file
Open in desktop
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.25.2
image: solidnerd/bookstack:0.26.1
depends_on:
- mysql
environment:
Expand All @@ -21,7 +21,7 @@ services:
- DB_PASSWORD=secret
volumes:
- uploads:/var/www/bookstack/public/uploads
- storage-uploads:/var/www/bookstack/public/storage
- storage-uploads:/var/www/bookstack/storage/uploads
ports:
- "8080:80"

Expand Down
15 changes: 14 additions & 1 deletion docker-entrypoint.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,6 +78,10 @@ if [ ! -f "$BOOKSTACK_HOME/.env" ]; then
MAIL_PASSWORD=${MAIL_PASSWORD:-null}
MAIL_ENCRYPTION=${MAIL_ENCRYPTION:-null}
# URL used for social login redirects, NO TRAILING SLASH

# Language Configuration
APP_LANG=${APP_LANG:-en}
APP_AUTO_LANG_PUBLIC=${APP_AUTO_LANG_PUBLIC:-true}
EOF
sed -ie "s/single/errorlog/g" config/app.php
else
Expand All @@ -86,6 +90,15 @@ sed -ie "s/single/errorlog/g" config/app.php
fi
fi

if [ ! -f "/usr/local/etc/php/php.ini" ]; then
cat > "/usr/local/etc/php/php.ini" <<EOF
[PHP]

post_max_size = ${post_max_size:-10M}
upload_max_filesize = ${upload_max_filesize:-10M}
EOF
fi

echoerr "wait-for-db: waiting for ${DB_HOST_NAME}:${DB_PORT}"

timeout 15 bash <<EOT
Expand Down Expand Up @@ -118,4 +131,4 @@ php artisan cache:clear

php artisan view:clear

exec apache2-foreground
exec apache2-foreground