Skip to content

Commit

Permalink
Upgrated php
Browse files Browse the repository at this point in the history
Upgraded nginx
Updated composer packages
  • Loading branch information
Steve Todd authored and adamquaile committed Nov 12, 2020
1 parent 54cb3a1 commit 9a89d79
Show file tree
Hide file tree
Showing 8 changed files with 1,597 additions and 614 deletions.
9 changes: 5 additions & 4 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM php:7.2-fpm-alpine as deps
FROM php:7.4-fpm-alpine3.12 as deps
COPY --from=composer:1.6 /usr/bin/composer /usr/bin/composer
WORKDIR /app
COPY app/AppKernel.php /app/app/
Expand All @@ -7,15 +7,16 @@ COPY composer.json /app/
COPY composer.lock /app/
RUN composer install --optimize-autoloader --no-interaction --ignore-platform-reqs --no-scripts

FROM php:7.2-fpm-alpine3.11
FROM php:7.4-fpm-alpine3.12
MAINTAINER Adam Quaile <[email protected]>
RUN apk update --no-cache \
&& apk add openssl \
&& apk add ca-certificates \
&& apk add zlib-dev \
&& apk add bash \
&& apk add nginx=1.16.1-r6 \
&& apk add nginx=1.18.0-r0 \
&& apk add zip \
&& apk add libzip-dev=1.6.1-r1 \
&& apk add unzip \
&& docker-php-source extract \
&& docker-php-ext-install zip \
Expand All @@ -41,4 +42,4 @@ RUN addgroup enveloper && adduser -D -G enveloper enveloper && \
/var/lib/nginx/ \
/etc/nginx
USER enveloper
CMD ["/usr/local/bin/shoreman"]
CMD ["/usr/local/bin/shoreman"]
2 changes: 0 additions & 2 deletions app/config/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -63,8 +63,6 @@ framework:
php_errors:
log: true
messenger:
serializer:
id: ~
transports:
email_queue: "%env(ENVELOPER_QUEUE_DSN)%"
routing:
Expand Down
2 changes: 1 addition & 1 deletion composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
"symfony/http-kernel": "^4.1",
"symfony/framework-bundle": "^4.1",
"swiftmailer/swiftmailer": "^6.0",
"twig/twig": "^2.4",
"twig/twig": "^2.13",
"league/flysystem": "^1.0",
"league/flysystem-memory": "^1.0",
"zendframework/zend-diactoros": "^1.4",
Expand Down
Loading

0 comments on commit 9a89d79

Please sign in to comment.