Skip to content

Commit

Permalink
Updated from pc
Browse files Browse the repository at this point in the history
  • Loading branch information
rubenvdlinde committed Jan 7, 2020
1 parent 82b07f1 commit 779c1a8
Show file tree
Hide file tree
Showing 16 changed files with 1,472 additions and 1,215 deletions.
4 changes: 2 additions & 2 deletions api/.env
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,8 @@ CONDUCTION_COMMONGROUND_BAG_APIKEY=!ChangeMe!
###> symfony/framework-bundle ###
#APP_ENV=dev
#APP_VERSION=0.0.1
#APP_TITLE='Basisregistratie Personen'
#APP_NAME='brp'
#APP_TITLE='Proto Component (PC)'
#APP_NAME='pc'
APP_DESCRIPTION='Naast deze JSON rest API is er ook een [graphql](/graphql) interface beschikbaar.'
APP_SECRET=!ChangeMe!
#TRUSTED_PROXIES=10.0.0.0/8,172.16.0.0/12,192.168.0.0/16
Expand Down
9 changes: 3 additions & 6 deletions api/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -39,9 +39,9 @@ RUN set -eux; \
intl \
pdo_pgsql \
zip \
mysqli \
mysqli \
pdo_mysql \
pcntl \
pcntl \
gd \
; \
pecl install \
Expand Down Expand Up @@ -125,9 +125,6 @@ CMD ["php-fpm"]
# depends on the "php" stage above, and with an litle bit of help from https://github.com/shiphp/nginx-env
FROM shiphp/nginx-env AS api_platform_nginx

# We use our own more secure and limited config
#ONBUILD ADD docker/nginx/conf.d/default.conf /etc/nginx/conf.d/default.conf

# Due to our config we need a copy of the public folder for serving static content
COPY docker/nginx/conf.d/default.conf.template /etc/nginx/conf.d/default.conf
WORKDIR /srv/api
Expand All @@ -143,7 +140,7 @@ COPY --from=api_platform_php /srv/api/public public/
# "varnish" stage #
#############################
# does not depend on any of the above stages, but placed here to keep everything in one Dockerfile
#FROM cooptilleuls/varnish:${VARNISH_VERSION}-alpine AS api_platform_varnish
#FROM cooptilleuls/varnish:${VARNISH_VERSION}-alpine AS api_platform_varnish
FROM eeacms/varnish AS api_platform_varnish
#FROM varnish:6.3 AS api_platform_varnish

Expand Down
4 changes: 2 additions & 2 deletions api/composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,6 @@
"knplabs/knp-markdown-bundle": "^1.8",
"lexik/jwt-authentication-bundle": "^2.6",
"phpdocumentor/reflection-docblock": "^4.3",
"phpoffice/phpspreadsheet": "^1.10",
"ramsey/uuid": "^3.8",
"ramsey/uuid-doctrine": "^1.5",
"sensio/framework-extra-bundle": "^5.5",
Expand All @@ -24,6 +23,7 @@
"symfony/flex": "^1.1",
"symfony/framework-bundle": "4.3.*",
"symfony/mercure-bundle": "*",
"symfony/property-access": "4.4.*",
"symfony/yaml": "4.3.*",
"tbbc/money-bundle": "^3.1",
"webonyx/graphql-php": "^0.13.8"
Expand Down Expand Up @@ -63,7 +63,7 @@
"extra" : {
"symfony" : {
"allow-contrib" : false,
"require" : "4.3.*"
"require" : "4.4.*"
}
},
"scripts": {
Expand Down
Loading

0 comments on commit 779c1a8

Please sign in to comment.