Update and add new features

Author: dunglas

.env

@@ -0,0 +1 @@
+CONTAINER_REGISTRY_BASE=quay.io/api-platform

README.md

@@ -4,28 +4,15 @@ API Platform Demo
 This a demonstration application for the [API Platform Framework](https://api-platform.com).
 Try it online at <https://demo.api-platform.com>.
 
-Installation (recommended)
-==========================
+Install
+=======
 
-```shell
+    $ git clone https://github.com/api-platform/demo.git
+    $ docker-compose up
 
-$ git clone https://github.com/api-platform/demo.git
+And go to https://localhost.
 
-$ docker-compose up
-```
+Loading Fixtures
+================
 
-And go to https://localhost
-
-Installation (manual)
-=====================
-
-```shell
-
-$ git clone https://github.com/api-platform/demo.git
-
-# Create a user and a database in PostgreSQL and enter the credentials into .env
-
-$ composer install
-
-$ php bin/console doctrine:schema:update --force
-```
+    $ docker-compose exec php bin/console hautelook:fixtures:load

api/.env.dist

@@ -0,0 +1,23 @@
+# This file is a "template" of which env vars need to be defined for your application
+# Create environment variables when deploying to production
+# https://symfony.com/doc/current/best_practices/configuration.html#infrastructure-related-configuration
+
+###> symfony/framework-bundle ###
+APP_ENV=dev
+APP_SECRET=!ChangeMe!
+TRUSTED_PROXIES=10.0.0.0/8,172.16.0.0/12,192.168.0.0/16
+TRUSTED_HOSTS=localhost,api
+###< symfony/framework-bundle ###
+
+###> doctrine/doctrine-bundle ###
+# Format described at http://docs.doctrine-project.org/projects/doctrine-dbal/en/latest/reference/configuration.html#connecting-using-a-url
+# For an SQLite database, use: "sqlite:///%kernel.project_dir%/var/data.db"
+# Configure your db driver and server_version in config/packages/doctrine.yaml
+DATABASE_URL=pgsql://api-platform:!ChangeMe!@db/api
+###< doctrine/doctrine-bundle ###
+
+###> nelmio/cors-bundle ###
+CORS_ALLOW_ORIGIN=^https?://localhost:?[0-9]*$
+###< nelmio/cors-bundle ###
+
+VARNISH_URL=http://cache-proxy

api/Dockerfile

@@ -1,41 +1,48 @@
-FROM composer:1.6
-FROM php:7.2-fpm-alpine3.7
+ARG PHP_VERSION=7.2
+ARG ALPINE_VERSION=3.7
+FROM php:${PHP_VERSION}-fpm-alpine${ALPINE_VERSION}
 
-RUN apk add --no-cache --virtual .persistent-deps \
-		git \
-		icu-libs \
-		libpq \
-		zlib
+RUN apk add --no-cache \
+		git
 
-ENV APCU_VERSION 5.1.9
+ARG APCU_VERSION=5.1.11
 RUN set -xe \
 	&& apk add --no-cache --virtual .build-deps \
 		$PHPIZE_DEPS \
 		icu-dev \
 		postgresql-dev \
 		zlib-dev \
-	&& docker-php-ext-install \
+	&& docker-php-ext-install -j$(nproc) \
 		intl \
 		pdo_pgsql \
 		zip \
 	&& pecl install \
 		apcu-${APCU_VERSION} \
+	&& pecl clear-cache \
 	&& docker-php-ext-enable --ini-name 20-apcu.ini apcu \
 	&& docker-php-ext-enable --ini-name 05-opcache.ini opcache \
+	&& runDeps="$( \
+		scanelf --needed --nobanner --format '%n#p' --recursive /usr/local/lib/php/extensions \
+			| tr ',' '\n' \
+			| sort -u \
+			| awk 'system("[ -e /usr/local/lib/" $1 " ]") == 0 { next } { print "so:" $1 }' \
+	)" \
+	&& apk add --no-cache --virtual .api-phpexts-rundeps $runDeps \
 	&& apk del .build-deps
 
-COPY --from=0 /usr/bin/composer /usr/bin/composer
+COPY --from=composer:latest /usr/bin/composer /usr/bin/composer
 COPY docker/php/php.ini /usr/local/etc/php/php.ini
-COPY docker/php/docker-entrypoint.sh /usr/local/bin/docker-entrypoint
-RUN chmod +x /usr/local/bin/docker-entrypoint
+
+# https://getcomposer.org/doc/03-cli.md#composer-allow-superuser
+ENV COMPOSER_ALLOW_SUPERUSER=1
+RUN composer global require "hirak/prestissimo:^0.3" --prefer-dist --no-progress --no-suggest --classmap-authoritative \
+	&& composer clear-cache
+ENV PATH="${PATH}:/root/.composer/vendor/bin"
 
 WORKDIR /srv/api
-ENTRYPOINT ["docker-entrypoint"]
-CMD ["php-fpm"]
 
-# https://getcomposer.org/doc/03-cli.md#composer-allow-superuser
-ENV COMPOSER_ALLOW_SUPERUSER 1
-RUN composer global require "hirak/prestissimo:^0.3" --prefer-dist --no-progress --no-suggest --classmap-authoritative
+# Build for production
+ARG APP_ENV=prod
 
 # Prevent the reinstallation of vendors at every changes in the source code
 COPY composer.json composer.lock ./
@@ -44,6 +51,15 @@ RUN composer install --prefer-dist --no-dev --no-autoloader --no-scripts --no-pr
 
 COPY . ./
 
-RUN mkdir -p var/cache var/logs var/sessions \
+RUN mkdir -p var/cache var/log var/sessions \
 	&& composer dump-autoload --classmap-authoritative --no-dev \
+	&& composer run-script --no-dev post-install-cmd \
+	&& chmod +x bin/console && sync \
 	&& chown -R www-data var
+VOLUME /srv/api/var
+
+COPY docker/php/docker-entrypoint.sh /usr/local/bin/docker-entrypoint
+RUN chmod +x /usr/local/bin/docker-entrypoint
+
+ENTRYPOINT ["docker-entrypoint"]
+CMD ["php-fpm"]

api/composer.json

@@ -5,7 +5,7 @@
         "php": "^7.1.3",
         "ext-iconv": "*",
         "api-platform/api-pack": "^1.0",
-        "api-platform/core": "^2.2@beta",
+        "api-platform/core": "^2.2",
         "guzzlehttp/guzzle": "^6.3",
         "nelmio/cors-bundle": "^1.5",
         "sensiolabs/security-checker": "^4.1",
@@ -21,13 +21,13 @@
         "behat/mink": "^1.7",
         "behat/mink-browserkit-driver": "^1.3",
         "behat/mink-extension": "^2.3",
-        "behat/symfony2-extension": "^2.1.4@dev",
+        "behat/symfony2-extension": "^2.1.4",
         "behatch/contexts": "^3.0",
         "doctrine/data-fixtures": "^1.3",
-        "hautelook/alice-bundle": "^2.0@beta",
+        "hautelook/alice-bundle": "^2.0",
         "symfony/dotenv": "^4.0",
         "symfony/var-dumper": "^4.0",
-        "theofidry/alice-data-fixtures": "^1.0@rc"
+        "theofidry/alice-data-fixtures": "^1.0"
     },
     "config": {
         "preferred-install": {
@@ -70,7 +70,6 @@
     },
     "extra": {
         "symfony": {
-            "id": "01C1CWTW6ZY7WVG0P7FRFVZ00W",
             "allow-contrib": false
         }
     }