Merge pull request #4170 from osmcz/cuzk

[rails.git] / .github / workflows / docker.yml

diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml
index acc19b8c0ef70f9d8cd1a00638a326599a4b508f..771d307cfe8d412631548f0ebec2a629fe46b897 100644 (file)
--- a/.github/workflows/docker.yml
+++ b/.github/workflows/docker.yml
@@ -8,10 +8,10 @@ concurrency:
 jobs:
   test:
     name: Docker
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
     steps:
     - name: Checkout source
-      uses: actions/checkout@v3
+      uses: actions/checkout@v4
     - name: Poke config
       run: |
         cp config/example.storage.yml config/storage.yml
@@ -19,17 +19,17 @@ jobs:
         touch config/settings.local.yml
     - name: Build Docker Image
       run: |
-        docker-compose build
-    - name: Start Docker-Compose
+        docker compose build
+    - name: Start Docker Compose
       run: |
-        docker-compose up -d
+        docker compose up -d
         sleep 15 # let the DB warm up a little
     - name: Prepare Database
       run: |
-        docker-compose run --rm web bundle exec rails db:migrate
-        docker-compose run --rm web bundle exec rails i18n:js:export
-        docker-compose run --rm web bundle exec rails assets:precompile
-        docker-compose run --rm web osmosis --rx docker/null-island.osm.xml --wd host=db database=openstreetmap user=openstreetmap password=openstreetmap validateSchemaVersion=no
+        docker compose run --rm web bundle exec rails db:migrate
+        docker compose run --rm web bundle exec rails i18n:js:export
+        docker compose run --rm web bundle exec rails assets:precompile
+        docker compose run --rm web osmosis --rx docker/null-island.osm.xml --wd host=db database=openstreetmap user=openstreetmap password=openstreetmap validateSchemaVersion=no
     - name: Test Basic Website
       run: |
         curl -siL http://127.0.0.1:3000 | egrep '^HTTP/1.1 200 OK'
@@ -37,5 +37,5 @@ jobs:
         curl -siL http://127.0.0.1:3000/api/0.6/node/1 | grep 'Null Island'
     - name: Test Complete Suite
       run: |
-        docker-compose run --rm web bundle exec rails db:test:prepare
-        docker-compose run --rm web bundle exec rails test:all
+        docker compose run --rm web bundle exec rails db:test:prepare
+        docker compose run --rm web bundle exec rails test:all