Merge branch 'dev' of https://git.willaspace.com/WillaEngine-Project/WillaEngine into dev
commit
a081af688b
@ -1,8 +1,3 @@
|
||||
FROM registry.willaspace.com/willaspace/willaengine-staging:latest AS php_builder
|
||||
|
||||
WORKDIR /var/www/html/
|
||||
RUN npm install
|
||||
RUN npm run staging
|
||||
|
||||
FROM nginx:1.21.1
|
||||
COPY --from=php_builder /var/www/html /var/www/html
|
||||
|
||||
COPY public /var/www/html/public
|
||||
|
@ -1,38 +1,6 @@
|
||||
FROM dfs1368/laravel-php-fpm:7.4
|
||||
|
||||
ARG ssh_prv_key
|
||||
FROM fsaravi/standard-laravel:7.4
|
||||
|
||||
WORKDIR /var/www/html
|
||||
|
||||
RUN apt install -y sendmail openssh-server libpng-dev
|
||||
|
||||
# Authorize SSH Host
|
||||
RUN mkdir -p /root/.ssh && \
|
||||
chmod 0700 /root/.ssh && \
|
||||
echo "$ssh_prv_key" > /root/.ssh/id_rsa && \
|
||||
ssh-keyscan git.willaspace.com > /root/.ssh/known_hosts && \
|
||||
chmod 600 /root/.ssh/id_rsa
|
||||
|
||||
RUN docker-php-ext-install gd
|
||||
|
||||
RUN curl -fsSL https://deb.nodesource.com/setup_lts.x | bash - && \
|
||||
apt-get install -y nodejs
|
||||
|
||||
RUN printf 'upload_max_filesize=300M;\npost_max_size=300M;\nmax_execution_time=600;\nmax_input_time=600;\n' >> /usr/local/etc/php/conf.d/docker-php-memlimit.ini;
|
||||
RUN echo 'pm.max_children = 100' >> /usr/local/etc/php-fpm.d/zz-docker.conf
|
||||
|
||||
COPY database /var/www/html/database
|
||||
|
||||
COPY composer-staging.* /var/www/html/
|
||||
|
||||
RUN composer clearcache && COMPOSER=composer-staging.json composer install --no-scripts
|
||||
|
||||
COPY . /var/www/html
|
||||
|
||||
RUN php artisan morphmap:cache
|
||||
|
||||
RUN chown -R www-data:www-data \
|
||||
/var/www/html/public \
|
||||
/var/www/html/storage \
|
||||
/var/www/html/bootstrap/cache
|
||||
|
||||
|
Loading…
Reference in new issue