Merge branch 'develop' of github.com:Rudloff/alltube into develop
This commit is contained in:
commit
7020c7516f
1 changed files with 2 additions and 2 deletions
|
@ -1,6 +1,6 @@
|
|||
FROM php:7.0-apache
|
||||
RUN apt-get update && apt-get install -my gnupg
|
||||
RUN curl -sL https://deb.nodesource.com/setup_6.x | bash -
|
||||
RUN curl -sL https://deb.nodesource.com/setup_8.x | bash -
|
||||
RUN curl -sS https://dl.yarnpkg.com/debian/pubkey.gpg | apt-key add -
|
||||
RUN echo "deb https://dl.yarnpkg.com/debian/ stable main" | tee /etc/apt/sources.list.d/yarn.list
|
||||
RUN apt-get update
|
||||
|
@ -15,7 +15,7 @@ RUN a2enmod rewrite
|
|||
RUN curl -sS https://getcomposer.org/installer | php
|
||||
COPY resources/php.ini /usr/local/etc/php/
|
||||
COPY . /var/www/html/
|
||||
RUN php composer.phar install --prefer-dist
|
||||
RUN php composer.phar install --prefer-dist --no-progress
|
||||
RUN yarn install --prod
|
||||
RUN yarn grunt
|
||||
ENV CONVERT=1
|
||||
|
|
Loading…
Reference in a new issue