wip

Author: dunglas

.github/workflows/ci.yml

@@ -12,12 +12,12 @@ jobs:
             - name: Checkout
               uses: actions/checkout@v2
             - name: Pull images
-              run: docker-compose pull
+              run: docker compose pull
             - name: Start services
-              run: docker-compose up --build -d
+              run: docker compose up --build -d
             - name: Wait for services
               run: |
-                  while status="$(docker inspect --format="{{if .Config.Healthcheck}}{{print .State.Health.Status}}{{end}}" "$(docker-compose ps -q php)")"; do
+                  while status="$(docker inspect --format="{{if .Config.Healthcheck}}{{print .State.Health.Status}}{{end}}" "$(docker compose ps -q php)")"; do
                     case $status in
                       starting) sleep 1;;
                       healthy) exit 0;;

README.md

@@ -7,7 +7,7 @@ A [Docker](https://www.docker.com/)-based installer and runtime for the [Symfony
 ## Getting Started
 
 1. If not already done, [install Docker Compose](https://docs.docker.com/compose/install/)
-2. Run `docker-compose up` (the logs will be displayed in the current shell)
+2. Run `docker compose up` (the logs will be displayed in the current shell)
 3. Open `https://localhost` in your favorite web browser and [accept the auto-generated TLS certificate](https://stackoverflow.com/a/15076602/1352334)
 
 ## Features

docker/php/docker-entrypoint.sh

@@ -17,6 +17,7 @@ if [ "$1" = 'php-fpm' ] || [ "$1" = 'php' ] || [ "$1" = 'bin/console' ]; then
 
 	# The first time volumes are mounted, the project needs to be recreated
 	if [ ! -f composer.json ]; then
+		CREATION=1
 		composer create-project "$SKELETON $SYMFONY_VERSION" tmp --stability="$STABILITY" --prefer-dist --no-progress --no-interaction --no-install
 
 		cd tmp
@@ -35,6 +36,11 @@ if [ "$1" = 'php-fpm' ] || [ "$1" = 'php' ] || [ "$1" = 'bin/console' ]; then
 	composer install --prefer-dist --no-progress --no-interaction
 
 	if grep -q ^DATABASE_URL= .env; then
+		if [ -z "$CREATION" ]; then
+			echo "Please stop and start docker compose again to finish the installation."
+			sleep infinity
+		fi
+
 		echo "Waiting for db to be ready..."
 		ATTEMPTS_LEFT_TO_REACH_DATABASE=60
 		until [ $ATTEMPTS_LEFT_TO_REACH_DATABASE -eq 0 ] || DATABASE_ERROR=$(bin/console dbal:run-sql "SELECT 1" 2>&1); do

docs/build.md

@@ -5,15 +5,15 @@
 By default, Symfony Docker will install the minimalist skeleton.
 To install the ["website skeleton"](https://symfony.com/doc/current/setup.html#creating-symfony-applications), use the following command:
 
-    SKELETON=symfony/website-skeleton docker-compose up --build
+    SKELETON=symfony/website-skeleton docker compose up --build
 
 ## Selecting a Specific Symfony Version
 
 Use the `SYMFONY_VERSION` environment variable to select a specific Symfony version.
 
 For instance, use the following command to install Symfony 4.4:
 
-    SYMFONY_VERSION=4.4.* docker-compose up --build
+    SYMFONY_VERSION=4.4.* docker compose up --build
 
 ## Installing Development Versions of Symfony
 
@@ -22,12 +22,12 @@ The value must be [a valid Composer stability option](https://getcomposer.org/do
 
 For instance, use the following command to use the `master` branch of Symfony:
 
-    STABILITY=dev docker-compose up --build
+    STABILITY=dev docker compose up --build
 
 ## Customizing the Server Name
 
 Use the `SERVER_NAME` environment variable to define your custom server name(s).
 
-    SERVER_NAME="symfony.wip, caddy:80" docker-compose up --build
+    SERVER_NAME="symfony.wip, caddy:80" docker compose up --build
 
 If you use Mercure, keep `caddy:80` in the list to allow the PHP container to request the caddy service.

docs/production.md

@@ -66,7 +66,7 @@ Go into the directory containing your project (`<project-name>`), and start the
 SERVER_NAME=your-domain-name.example.com \
 APP_SECRET=ChangeMe \
 CADDY_MERCURE_JWT_SECRET=ChangeMe \
-docker-compose -f docker-compose.yml -f docker-compose.prod.yml up -d
+docker compose -f docker-compose.yml -f docker-compose.prod.yml up -d
 ```
 
 Be sure to replace `your-domain-name.example.com` by your actual domain name and to set the values of `APP_SECRET`, `CADDY_MERCURE_JWT_SECRET` to cryptographically secure random values.
@@ -82,7 +82,7 @@ Alternatively, if you don't want to expose an HTTPS server but only an HTTP one,
 SERVER_NAME=:80 \
 APP_SECRET=ChangeMe \
 CADDY_MERCURE_JWT_SECRET=ChangeMe \
--docker-compose -f docker-compose.yml -f docker-compose.prod.yml up -d
+docker compose -f docker-compose.yml -f docker-compose.prod.yml up -d
 ```
 
 ## Deploying on Multiple Nodes

docs/troubleshooting.md

@@ -2,16 +2,16 @@
 
 ## Editing Permissions on Linux
 
-If you work on linux and cannot edit some of the project files right after the first installation, you can run `docker-compose run --rm php chown -R $(id -u):$(id -g) .` to set yourself as owner of the project files that were created by the docker container.
+If you work on linux and cannot edit some of the project files right after the first installation, you can run `docker compose run --rm php chown -R $(id -u):$(id -g) .` to set yourself as owner of the project files that were created by the docker container.
 
 ## Fix Chrome/Brave SSL
 
 If you have a TLS trust issues, you can copy the self-signed certificate from Caddy and add it to the trusted certificates :
 
     # Mac
-    $ docker cp $(docker-compose ps -q caddy):/data/caddy/pki/authorities/local/root.crt /tmp/root.crt && sudo security add-trusted-cert -d -r trustRoot -k /Library/Keychains/System.keychain /tmp/root.crt
+    $ docker cp $(docker compose ps -q caddy):/data/caddy/pki/authorities/local/root.crt /tmp/root.crt && sudo security add-trusted-cert -d -r trustRoot -k /Library/Keychains/System.keychain /tmp/root.crt
     # Linux
-    $ docker cp $(docker-compose ps -q caddy):/data/caddy/pki/authorities/local/root.crt /usr/local/share/ca-certificates/root.crt && sudo update-ca-certificates
+    $ docker cp $(docker compose ps -q caddy):/data/caddy/pki/authorities/local/root.crt /usr/local/share/ca-certificates/root.crt && sudo update-ca-certificates
 
 ## HTTPs and Redirects
 

docs/xdebug.md

@@ -52,15 +52,15 @@ services:
 Then run:
 
 ```console
-docker-compose -f docker-compose.yml -f docker-compose.debug.yml up -d
+docker compose -f docker-compose.yml -f docker-compose.debug.yml up -d
 ```
 
 ## Troubleshooting
 
 Inspect the installation with the following command. The requested Xdebug version should be displayed in the output.
 
 ```console
-$ docker-compose exec php php --version
+$ docker compose exec php php --version
 
 PHP ...
     with Xdebug v3.0.4 ...