Merge branch 'release-0.7.2'

pacoorozco · May 20, 2018 · d487b7e · d487b7e
2 parents 1b3ddcd + be0f14e
commit d487b7e
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 12 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -5,6 +5,13 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/) and this p
 
 ## Unreleased
 
+## 0.8.0 - 2018-05-20
+### Changed
+-  Improve Dockerfile creation to speed it up
+
+### Fixed
+-  Fix bower dependency problems (#42)
+
 ## 0.7.1 - 2017-08-26
 
 ### Changed

diff --git a/config/app.php b/config/app.php
@@ -121,7 +121,7 @@
     |
     */
 
-    'version' => '0.7.1',
+    'version' => '0.8.0',
 
     /*
     |--------------------------------------------------------------------------

diff --git a/docker/web/Dockerfile b/docker/web/Dockerfile
@@ -8,38 +8,40 @@ ENV PROBIND_USER probind
 ENV DEBIAN_FRONTEND noninteractive
 ENV TERM linux
 
+# Update and install needed packages
 RUN apt-get update \
     && apt-get install -y --no-install-recommends --no-install-suggests \
     git \
     libmcrypt-dev \
     nodejs \
     npm
 
+# Configure PHP with needed modules
 RUN docker-php-ext-install \
     json \
     mbstring \
     mcrypt \
     pdo_mysql \
     zip
 
-RUN a2enmod rewrite
-
-RUN update-alternatives --install /usr/bin/node node /usr/bin/nodejs 10
-
-RUN curl -sS https://getcomposer.org/installer | php \
-    && mv composer.phar /usr/local/bin/composer \
-    && npm install -g bower
+# Configure Node.js and install bower and composer
+RUN update-alternatives --install /usr/bin/node node /usr/bin/nodejs 10 \
+    && npm install -g bower \
+    && curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin --filename=composer
 
+# Configure Apache and add our site
+RUN a2enmod rewrite
 COPY apache/000-default.conf /etc/apache2/sites-available/000-default.conf
 
-RUN useradd -r -g www-data ${PROBIND_USER}
-
-RUN git clone https://github.com/pacoorozco/probind.git ${PROBIND_ROOT} \
+# Download code from Git and install all dependencies
+RUN git clone --depth 1 https://github.com/pacoorozco/probind.git ${PROBIND_ROOT} \
     && cd ${PROBIND_ROOT} \
     && composer install --no-plugins --no-scripts --prefer-dist --no-interaction \
     && bower install --allow-root 
 
-RUN cd ${PROBIND_ROOT} \
+# Configure our application
+RUN useradd -r -g www-data ${PROBIND_USER} \
+    && cd ${PROBIND_ROOT} \
     && cp .env.example .env \
     && sed -i "s/DB_HOST=127.0.0.1/DB_HOST=db/" .env \
     && sed -i "s/REDIS_HOST=127.0.0.1/REDIS_HOST=redis/" .env \