Merge pull request #1 from SolidNerd/refactoring

Refactor it to the latest docker standards and ADD docker-compose.yml

Author: Kilhog

Dockerfile

@@ -1,16 +1,28 @@
 FROM php:5.6-apache
 MAINTAINER kilhog@protonmail.com
-RUN apt-get update && apt-get install -y git zlib1g-dev libfreetype6-dev libjpeg62-turbo-dev libmcrypt-dev libpng12-dev \
+
+ENV BOOKSTACK BookStack
+ENV BOOKSTACK_VERSION 0.9.2
+
+RUN apt-get update && apt-get install -y git zlib1g-dev libfreetype6-dev libjpeg62-turbo-dev libmcrypt-dev libpng12-dev wget \
    && docker-php-ext-install pdo pdo_mysql mbstring zip \
    && docker-php-ext-configure gd --with-freetype-dir=usr/include/ --with-jpeg-dir=/usr/include/ \
-   && docker-php-ext-install gd
-RUN cd ~ && curl -sS https://getcomposer.org/installer | php
-RUN mv ~/composer.phar /usr/local/bin/composer
-RUN cd /var/www/ && git clone https://github.com/ssddanbrown/BookStack.git --branch 0.7.2 --single-branch BookStack
-RUN cd /var/www/BookStack && composer install
-RUN chown -R www-data:www-data /var/www/BookStack
+   && docker-php-ext-install gd \
+   && cd /var/www && curl -sS https://getcomposer.org/installer | php \
+   && mv /var/www/composer.phar /usr/local/bin/composer \
+   && wget https://github.com/ssddanbrown/BookStack/archive/v${BOOKSTACK_VERSION}.tar.gz -O ${BOOKSTACK}.tar.gz \
+   && tar -xf ${BOOKSTACK}.tar.gz && mv BookStack-${BOOKSTACK_VERSION} ${BOOKSTACK} && rm ${BOOKSTACK}.tar.gz  \
+   && cd /var/www/BookStack && composer install \
+   && chown -R www-data:www-data /var/www/BookStack \
+   && apt-get -y autoremove \
+   && apt-get clean \
+   && rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/*
+
 COPY bookstack.conf /etc/apache2/sites-enabled/bookstack.conf
 RUN a2enmod rewrite
 
 COPY docker-entrypoint.sh /
-ENTRYPOINT ["/docker-entrypoint.sh"]
+
+EXPOSE 80
+
+ENTRYPOINT ["/docker-entrypoint.sh"]

README.md

@@ -1,18 +1,55 @@
 # Docker Image For [BookStack](https://github.com/ssddanbrown/BookStack)
 [![](https://badge.imagelayers.io/kilhog/bookstack:latest.svg)](https://imagelayers.io/?images=kilhog/bookstack:latest 'Get your own badge on imagelayers.io')
-* 0.7.2 ([Dockerfile](https://github.com/Kilhog/docker-bookstack/blob/master/Dockerfile))
 
-## How to use this image
+## Current Version: [0.9.2 ](https://github.com/Kilhog/docker-bookstack/blob/master/Dockerfile)
 
-### Run MySQL Container
+## Quickstart
+With Docker Compose is a Quickstart very easy. Run the following command:
+
+```
+docker-compose up
+```
+
+and after that open your Browser and go to `http://localhost:8080` .
+
+
+## How to use the Image without Docker compose
+Networking changed in Docker v1.9, so you need to do one of the following steps.
+
+### Docker < v1.9
+1. MySQL Container:
 ```
-docker pull mysql
 docker run -d --name bookstack-mysql -p 3306:3306 -e MYSQL_ROOT_PASSWORD=secret -e MYSQL_DATABASE=bookstack -e MYSQL_USER=bookstack -e MYSQL_PASSWORD=secret mysql
 ```
-### Run Bookstack Container
+2. BookStack Container:
 ```
-docker pull kilhog/bookstack
 docker run --name my-bookstack -d --link bookstack-mysql:mysql -p 8080:80 kilhog/bookstack
 ```
 
-Now you can access to BookStack with : ip-adress-of-docker-machine:8080 👍
+### Docker 1.9+
+1. Create a shared network:
+   `docker network create bookstack_nw`
+
+2.  MySQL container :
+```
+docker run -d --net bookstack_nw  \
+-e MYSQL_ROOT_PASSWORD=secret \
+-e MYSQL_DATABASE=bookstack \
+-e MYSQL_USER=bookstack \
+-e MYSQL_PASSWORD=secret \
+ --name="bookstack_db" \
+ mysql
+```
+
+3. Create BookStack Container
+```
+docker run -d --net bookstack_nw  \
+-e DB_HOST=bookstack_db \
+-e DB_DATABASE=bookstack \
+-e DB_USERNAME=bookstack \
+-e DB_PASSWORD=secret \
+-p 8080:80
+ kilhog/bookstack
+```
+
+After the steps you can visit  `http://localhost:8080` .

docker-compose.yml

@@ -0,0 +1,20 @@
+version: '2'
+services:
+  bookstack:
+    image: kilhog/bookstack
+    depends_on:
+      - db
+    environment:
+    - DB_HOST=db
+    - DB_DATABASE=bookstack
+    - DB_USERNAME=bookstack
+    - DB_PASSWORD=secret
+    ports:
+    - "8080:80"
+  db:
+    image: mysql:5.7.12
+    environment:
+    - MYSQL_ROOT_PASSWORD=secret
+    - MYSQL_DATABASE=bookstack
+    - MYSQL_USER=bookstack
+    - MYSQL_PASSWORD=secret

docker-entrypoint.sh

@@ -1,21 +1,81 @@
 #!/bin/bash
 set -e
 
+echoerr() { echo "$@" 1>&2; }
+
 if [ ! -f '/var/www/BookStack/.env' ]; then
-    cp /var/www/BookStack/.env.example /var/www/BookStack/.env
+  if [ "$DB_HOST" ]; then
+  cat > /var/www/BookStack/.env <<EOF
+      # Environment
+      APP_ENV=production
+      APP_DEBUG=false
+      APP_KEY=SomeRandomString
+
+      # Database details
+      DB_HOST=${DB_HOST:-localhost}
+      DB_DATABASE=${DB_DATABASE:-bookstack}
+      DB_USERNAME=${DB_USERNAME:-bookstack}
+      DB_PASSWORD=${DB_PASSWORD:-password}
+
+      # Cache and session
+      CACHE_DRIVER=file
+      SESSION_DRIVER=file
+      # If using Memcached, comment the above and uncomment these
+      #CACHE_DRIVER=memcached
+      #SESSION_DRIVER=memcached
+      QUEUE_DRIVER=sync
+
+      # Memcached settings
+      # If using a UNIX socket path for the host, set the port to 0
+      # This follows the following format: HOST:PORT:WEIGHT
+      # For multiple servers separate with a comma
+      MEMCACHED_SERVERS=127.0.0.1:11211:100
+
+      # Storage
+      STORAGE_TYPE=local
+      # Amazon S3 Config
+      STORAGE_S3_KEY=false
+      STORAGE_S3_SECRET=false
+      STORAGE_S3_REGION=false
+      STORAGE_S3_BUCKET=false
+      # Storage URL
+      # Used to prefix image urls for when using custom domains/cdns
+      STORAGE_URL=false
 
-    if [ "$MYSQL_PORT_3306_TCP" ]; then
-        sed -i "s/\(DB_HOST *= *\).*/\1mysql/" '/var/www/BookStack/.env'
-        sed -i "s/\(DB_DATABASE *= *\).*/\1${MYSQL_ENV_MYSQL_DATABASE:-root}/" '/var/www/BookStack/.env'
-        sed -i "s/\(DB_USERNAME *= *\).*/\1${MYSQL_ENV_MYSQL_USER:-$MYSQL_ENV_MYSQL_ROOT_PASSWORD}/" '/var/www/BookStack/.env'
-        sed -i "s/\(DB_PASSWORD *= *\).*/\1${MYSQL_ENV_MYSQL_PASSWORD:-bookstack}/" '/var/www/BookStack/.env'
+      # General auth
+      AUTH_METHOD=standard
 
-        cd /var/www/BookStack/ && php artisan key:generate && php artisan migrate --force
+      # Social Authentication information. Defaults as off.
+      GITHUB_APP_ID=false
+      GITHUB_APP_SECRET=false
+      GOOGLE_APP_ID=false
+      GOOGLE_APP_SECRET=false
+      # URL used for social login redirects, NO TRAILING SLASH
+EOF
     else
         echo >&2 'warning: missing MYSQL_PORT_3306_TCP environment variables'
         echo >&2 '  Did you forget to --link some_mysql_container:mysql ?'
         exit 1
     fi
 fi
 
-apache2-foreground
+echoerr wait-for-db: waiting for ${DB_HOST}:3306
+
+timeout 15 bash <<EOT
+while ! (echo > /dev/tcp/${DB_HOST}/3306) >/dev/null 2>&1;
+    do sleep 1;
+done;
+EOT
+RESULT=$?
+
+if [ $RESULT -eq 0 ]; then
+  # sleep another second for so that we don't get a "the database system is starting up" error
+  sleep 1
+  echoerr wait-for-db: done
+else
+  echoerr wait-for-db: timeout out after 15 seconds waiting for ${DB_HOST}:3306
+fi
+
+cd /var/www/BookStack/ && php artisan key:generate && php artisan migrate --force
+
+exec apache2-foreground