From 1d6cce021d2038ffde1dacd3c905f63a3cc41ae2 Mon Sep 17 00:00:00 2001 From: mg17 <> Date: Thu, 9 May 2019 11:25:06 -0700 Subject: [PATCH 1/5] Updated git repo for custom BookStack build --- Dockerfile | 10 +++++----- docker-compose.yml | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/Dockerfile b/Dockerfile index 0fc910da..4ae1c635 100644 --- a/Dockerfile +++ b/Dockerfile @@ -12,8 +12,8 @@ RUN apt-get update && apt-get install -y git zlib1g-dev libfreetype6-dev libjpeg && 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/BookStackApp/BookStack/archive/v${BOOKSTACK_VERSION}.tar.gz -O ${BOOKSTACK}.tar.gz \ - && tar -xf ${BOOKSTACK}.tar.gz && mv BookStack-${BOOKSTACK_VERSION} ${BOOKSTACK_HOME} && rm ${BOOKSTACK}.tar.gz \ + && wget https://github.com/mg17/BookStack/archive/master.tar.gz -O master.tar.gz \ + && tar -xf master.tar.gz && mv BookStack $BOOKSTACK_HOME && rm master.tar.gz \ && cd $BOOKSTACK_HOME && composer install \ && chown -R www-data:www-data $BOOKSTACK_HOME \ && apt-get -y autoremove \ @@ -40,8 +40,8 @@ LABEL org.label-schema.build-date=$BUILD_DATE \ org.label-schema.docker.dockerfile="/Dockerfile" \ org.label-schema.license="MIT" \ org.label-schema.name="bookstack" \ - org.label-schema.vendor="solidnerd" \ - org.label-schema.url="https://github.com/solidnerd/docker-bookstack/" \ + org.label-schema.vendor="mg17" \ + org.label-schema.url="https://github.com/mg17/docker-bookstack/" \ org.label-schema.vcs-ref=$VCS_REF \ - org.label-schema.vcs-url="https://github.com/solidnerd/docker-bookstack.git" \ + org.label-schema.vcs-url="https://github.com/mg17/docker-bookstack.git" \ org.label-schema.vcs-type="Git" diff --git a/docker-compose.yml b/docker-compose.yml index 13da2879..97527cea 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -11,7 +11,7 @@ services: - mysql-data:/var/lib/mysql bookstack: - image: solidnerd/bookstack:0.25.2 + build: . depends_on: - mysql environment: From 85f9db2e73aa48ed8ff5fbabb1a94830304da78c Mon Sep 17 00:00:00 2001 From: mg17 <> Date: Thu, 9 May 2019 11:27:13 -0700 Subject: [PATCH 2/5] Updated application port --- docker-compose.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker-compose.yml b/docker-compose.yml index 97527cea..9cbf961b 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -23,7 +23,7 @@ services: - uploads:/var/www/bookstack/public/uploads - storage-uploads:/var/www/bookstack/public/storage ports: - - "8080:80" + - "8081:80" volumes: mysql-data: From a471e348d31da1d70f22c062a5beb134b0abbb59 Mon Sep 17 00:00:00 2001 From: mg17 <> Date: Thu, 9 May 2019 11:36:49 -0700 Subject: [PATCH 3/5] Changed .tar.gz to .zip for BookStack release --- Dockerfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index 4ae1c635..f7df3850 100644 --- a/Dockerfile +++ b/Dockerfile @@ -4,7 +4,7 @@ ENV BOOKSTACK=BookStack \ BOOKSTACK_VERSION=0.25.2 \ 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 \ +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 zip \ && docker-php-ext-install pdo pdo_mysql mbstring zip tidy \ && docker-php-ext-configure ldap \ && docker-php-ext-install ldap \ @@ -13,7 +13,7 @@ RUN apt-get update && apt-get install -y git zlib1g-dev libfreetype6-dev libjpeg && cd /var/www && curl -sS https://getcomposer.org/installer | php \ && mv /var/www/composer.phar /usr/local/bin/composer \ && wget https://github.com/mg17/BookStack/archive/master.tar.gz -O master.tar.gz \ - && tar -xf master.tar.gz && mv BookStack $BOOKSTACK_HOME && rm master.tar.gz \ + && unzip master.zip && mv BookStack-master/* $BOOKSTACK_HOME && rm master.zip \ && cd $BOOKSTACK_HOME && composer install \ && chown -R www-data:www-data $BOOKSTACK_HOME \ && apt-get -y autoremove \ From 3e0044a20a270c376c4e193de8066dea9b6d0188 Mon Sep 17 00:00:00 2001 From: mg17 <> Date: Thu, 9 May 2019 11:38:21 -0700 Subject: [PATCH 4/5] Changed .tar.gz to .zip for BookStack release revision --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index f7df3850..9e8d7716 100644 --- a/Dockerfile +++ b/Dockerfile @@ -12,7 +12,7 @@ RUN apt-get update && apt-get install -y git zlib1g-dev libfreetype6-dev libjpeg && 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/mg17/BookStack/archive/master.tar.gz -O master.tar.gz \ + && wget https://github.com/mg17/BookStack/archive/master.zip -O master.zip \ && unzip master.zip && mv BookStack-master/* $BOOKSTACK_HOME && rm master.zip \ && cd $BOOKSTACK_HOME && composer install \ && chown -R www-data:www-data $BOOKSTACK_HOME \ From c62bfbe9603c14e2b01909687d79c3ed41b253ff Mon Sep 17 00:00:00 2001 From: mg17 <> Date: Thu, 9 May 2019 11:44:08 -0700 Subject: [PATCH 5/5] Created /var/www/bookstack --- Dockerfile | 1 + 1 file changed, 1 insertion(+) diff --git a/Dockerfile b/Dockerfile index 9e8d7716..c4ec2bf3 100644 --- a/Dockerfile +++ b/Dockerfile @@ -12,6 +12,7 @@ RUN apt-get update && apt-get install -y git zlib1g-dev libfreetype6-dev libjpeg && docker-php-ext-install gd \ && cd /var/www && curl -sS https://getcomposer.org/installer | php \ && mv /var/www/composer.phar /usr/local/bin/composer \ + && mkdir /var/www/bookstack \ && wget https://github.com/mg17/BookStack/archive/master.zip -O master.zip \ && unzip master.zip && mv BookStack-master/* $BOOKSTACK_HOME && rm master.zip \ && cd $BOOKSTACK_HOME && composer install \