Skip to content

Commit 3226373

Browse files
author
Ionut Prunache
authored
Merge pull request #188 from younginnovations/1334-make-rc-subsite-docker-build-work-from-fresh
#1334 Fix Docker build from fresh
2 parents c86c6d7 + 21da5b2 commit 3226373

File tree

3 files changed

+84
-56
lines changed

3 files changed

+84
-56
lines changed

Dockerfile

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -29,10 +29,10 @@ RUN apk --update add \
2929
gettext \
3030
libffi-dev \
3131
&& rm /var/cache/apk/* \
32-
&& npm install --global gulp-cli \
33-
&& gem install --no-rdoc --no-ri sass \
34-
&& gem install --no-rdoc --no-ri bourbon \
35-
&& gem install --no-rdoc --no-ri io-console \
32+
&& npm install --global gulp-cli@2.0.1\
33+
&& gem install --no-rdoc --no-ri sass -v '~> 3.7.3'\
34+
&& gem install --no-rdoc --no-ri bourbon -v '~> 5.1.0'\
35+
&& gem install --no-rdoc --no-ri io-console -v 0.5.4\
3636
&& curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/bin --filename=composer \
3737
&& curl -O -L https://github.com/papertrail/remote_syslog2/releases/download/v0.20/remote_syslog_linux_amd64.tar.gz \
3838
&& tar -zxf remote_syslog_linux_amd64.tar.gz \

composer.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,11 +11,11 @@
1111
"league/flysystem-aws-s3-v2": "^1.0",
1212
"illuminate/mail": "5.1.*",
1313
"maatwebsite/excel": "~2.0",
14-
"lynx39/lara-pdf-merger": "dev-master",
1514
"rap2hpoutre/laravel-log-viewer": "^0.7.0",
1615
"barryvdh/laravel-debugbar": "^2.2",
1716
"barryvdh/laravel-snappy": "^0.3.1",
18-
"vsmoraes/laravel-pdf": "^1.0"
17+
"vsmoraes/laravel-pdf": "^1.0",
18+
"daltcore/lara-pdf-merger": "^2.0.6"
1919
},
2020
"require-dev":{
2121
"phpunit/phpunit": "~4.0",

composer.lock

Lines changed: 78 additions & 50 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)