Various fixes
This commit is contained in:
parent
051cee501b
commit
8976e1f9c2
@ -29,8 +29,7 @@ COPY docker/app/install-composer.sh /usr/local/bin/docker-app-install-composer
|
|||||||
RUN chmod +x /usr/local/bin/docker-app-install-composer
|
RUN chmod +x /usr/local/bin/docker-app-install-composer
|
||||||
|
|
||||||
RUN set -xe \
|
RUN set -xe \
|
||||||
&& apk add --no-cache --virtual .fetch-deps \
|
&& apk add --no-cache --virtual .fetch-deps openssl \
|
||||||
openssl \
|
|
||||||
&& docker-app-install-composer \
|
&& docker-app-install-composer \
|
||||||
&& mv composer.phar /usr/local/bin/composer \
|
&& mv composer.phar /usr/local/bin/composer \
|
||||||
&& apk del .fetch-deps
|
&& apk del .fetch-deps
|
||||||
@ -43,8 +42,7 @@ RUN composer global require "hirak/prestissimo:^0.3" --prefer-dist --no-progress
|
|||||||
|
|
||||||
WORKDIR /srv/app
|
WORKDIR /srv/app
|
||||||
|
|
||||||
COPY composer.json ./
|
COPY composer.* ./
|
||||||
COPY composer.lock ./
|
|
||||||
|
|
||||||
RUN mkdir -p \
|
RUN mkdir -p \
|
||||||
var/cache \
|
var/cache \
|
||||||
|
@ -11,15 +11,15 @@ services:
|
|||||||
- .env
|
- .env
|
||||||
volumes:
|
volumes:
|
||||||
# Comment out the next line in production
|
# Comment out the next line in production
|
||||||
- ./:/srv/app:rw
|
- ./:/srv/app/:rw
|
||||||
# This is for assets:install
|
# This is for assets:install
|
||||||
- ./web:/srv/app/web:rw
|
- ./web/:/srv/app/web/:rw
|
||||||
# If you develop on Linux, comment out the following volumes to just use bind-mounted project directory from host
|
# If you develop on Linux, comment out the following volumes to just use bind-mounted project directory from host
|
||||||
- /srv/app/var
|
- /srv/app/var/
|
||||||
- /srv/app/var/cache
|
- /srv/app/var/cache/
|
||||||
- /srv/app/var/logs
|
- /srv/app/var/logs/
|
||||||
- /srv/app/var/sessions
|
- /srv/app/var/sessions/
|
||||||
- /srv/app/vendor
|
- /srv/app/vendor/
|
||||||
|
|
||||||
nginx:
|
nginx:
|
||||||
build:
|
build:
|
||||||
|
@ -7,11 +7,7 @@ if [ "${1#-}" != "$1" ]; then
|
|||||||
fi
|
fi
|
||||||
|
|
||||||
if [ "$1" = 'php-fpm' ] || [ "$1" = 'bin/console' ]; then
|
if [ "$1" = 'php-fpm' ] || [ "$1" = 'bin/console' ]; then
|
||||||
# Detect the host IP
|
if [ "$APP_ENV" = 'prod' ]; then
|
||||||
export DOCKER_BRIDGE_IP
|
|
||||||
DOCKER_BRIDGE_IP=$(ip ro | grep default | cut -d' ' -f 3)
|
|
||||||
|
|
||||||
if [ "$SYMFONY_ENV" = 'prod' ]; then
|
|
||||||
composer install --prefer-dist --no-dev --no-progress --no-suggest --optimize-autoloader --classmap-authoritative --no-interaction
|
composer install --prefer-dist --no-dev --no-progress --no-suggest --optimize-autoloader --classmap-authoritative --no-interaction
|
||||||
else
|
else
|
||||||
composer install --prefer-dist --no-progress --no-suggest --no-interaction
|
composer install --prefer-dist --no-progress --no-suggest --no-interaction
|
||||||
|
@ -1,3 +1,3 @@
|
|||||||
FROM nginx:1.11-alpine
|
FROM nginx:1.13-alpine
|
||||||
|
|
||||||
COPY conf.d /etc/nginx/conf.d/
|
COPY conf.d /etc/nginx/conf.d/
|
||||||
|
Loading…
x
Reference in New Issue
Block a user