Docker compose v2 compatibility

README.md

@@ -89,19 +89,18 @@ docker-compose ps
 This should look something like this:
 
 ```
-          Name                            Command               State                 Ports               
-----------------------------------------------------------------------------------------------------------
-development_cache_1            docker-entrypoint.sh memca ...   Up      11211/tcp                         
-development_db_1               docker-entrypoint.sh --sor ...   Up      0.0.0.0:33066->3306/tcp, 33060/tcp
-development_mailcatcher_1      container-entrypoint mailc ...   Up      0.0.0.0:1080->1080/tcp, 8080/tcp                       
-development_rails_1            rails-entrypoint rails ser ...   Up      0.0.0.0:3000->3000/tcp, 8080/tcp  
-development_rails_test_core_1  rails-entrypoint sleep inf ...   Up 
-development_sphinx_1           sphinx-start                     Up      36307/tcp 
-development_webpack_1          webpack-entrypoint /usr/sr ...   Up      0.0.0.0:3035->3035/tcp
-development_worker_1           rails-entrypoint rails job ...   Up      8080/tcp
+NAME                            IMAGE                                      COMMAND                  SERVICE           CREATED        STATUS              PORTS
+development-cache-1             memcached:1.6-alpine                       "docker-entrypoint.s…"   cache             3 hours ago    Up 3 hours          11211/tcp
+development-db-1                mysql:5.7                                  "docker-entrypoint.s…"   db                23 hours ago   Up 3 hours          33060/tcp, 0.0.0.0:33066->3306/tcp, :::33066->3306/tcp
+development-mailcatcher-1       ghcr.io/hitobito/development/mailcatcher   "mailcatcher -f --ip…"   mailcatcher       3 hours ago    Up 3 hours          0.0.0.0:1080->1080/tcp, :::1080->1080/tcp
+development-rails-1             ghcr.io/hitobito/development/rails         "rails-entrypoint.sh…"   rails             3 hours ago    Up 3 hours          0.0.0.0:3000->3000/tcp, :::3000->3000/tcp
+development-rails_test_core-1   ghcr.io/hitobito/development/rails         "rails-entrypoint.sh…"   rails_test_core   21 hours ago   Up About a minute
+development-sphinx-1            macbre/sphinxsearch:3.1.1                  "sphinx-start"           sphinx            23 hours ago   Up 3 hours          36307/tcp
+development-webpack-1           ghcr.io/hitobito/development/rails         "webpack-entrypoint.…"   webpack           3 hours ago    Up About a minute   0.0.0.0:3035->3035/tcp, :::3035->3035/tcp
+development-worker-1            ghcr.io/hitobito/development/rails         "rails-entrypoint.sh…"   worker            3 hours ago    Up About a minute
 ```
 
-*The `_sphinx_1` container seems to be flaky. You can safely ignore a state `Exit 2`.*
+*The `-sphinx-1` container seems to be flaky. You can safely ignore a state `Exit 2`.*
 
 Access the web application by browser: http://localhost:3000 and log in using *hitobito@puzzle.ch* and password *hito42bito*. For some wagons, the e-mail address is different. Go to the file ```/config/settings.yml``` inside your wagon repository and look out for the field "root_email". Use this e-mail address to login.
 
@@ -310,4 +309,4 @@ docker-compose -f docker-compose.yml -f nextcloud.yml down --volumes
 # Start again
 docker-compose -f docker-compose.yml -f nextcloud.yml up
 # Now it should work
-```
+```

bin/attach_to_worker

@@ -9,7 +9,7 @@ source $(dirname $0)/_basics
 project=$(basename $(pwd))
 
 container() {
-    docker ps | grep "${project}_worker_1"
+    docker ps | grep "${project}-worker-1"
 }
 
 if ! container >/dev/null; then

docker-compose.yml

@@ -1,4 +1,3 @@
-version: '3.4'
 services:
   rails: &rails
     build: