diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index c4ce13391..079a206ec 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -53,7 +53,7 @@ jobs: - name: Create tarball run: tar -czpf /tmp/workdir.tar.gz . && mv /tmp/workdir.tar.gz . - name: Upload workdir - uses: actions/upload-artifact@v1 + uses: actions/upload-artifact@v4 with: name: workdir path: workdir.tar.gz @@ -66,7 +66,7 @@ jobs: needs: workdir steps: - name: Download workdir - uses: actions/download-artifact@v1 + uses: actions/download-artifact@v4 with: name: workdir path: . @@ -80,7 +80,7 @@ jobs: needs: workdir steps: - name: Download workdir - uses: actions/download-artifact@v1 + uses: actions/download-artifact@v4 with: name: workdir path: . @@ -96,7 +96,7 @@ jobs: needs: workdir steps: - name: Download workdir - uses: actions/download-artifact@v1 + uses: actions/download-artifact@v4 with: name: workdir path: . @@ -119,7 +119,7 @@ jobs: needs: workdir steps: - name: Download workdir - uses: actions/download-artifact@v1 + uses: actions/download-artifact@v4 with: name: workdir path: . @@ -135,7 +135,7 @@ jobs: needs: workdir steps: - name: Download workdir - uses: actions/download-artifact@v1 + uses: actions/download-artifact@v4 with: name: workdir path: . @@ -159,7 +159,7 @@ jobs: needs: workdir steps: - name: Download workdir - uses: actions/download-artifact@v1 + uses: actions/download-artifact@v4 with: name: workdir path: . diff --git a/docker-compose.override.yml b/docker-compose.override.yml index 8a54b99a7..9035783ca 100644 --- a/docker-compose.override.yml +++ b/docker-compose.override.yml @@ -1,5 +1,3 @@ -version: "3.4" - services: app: ports: diff --git a/docker-compose.yml b/docker-compose.yml index 704b1c4db..3634c8940 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -7,7 +7,6 @@ volumes: x-app-base: &app-base - container_name: srs.app image: skaut/lebeda:8.1 volumes: - www:/var/www @@ -22,12 +21,14 @@ x-app-base: services: app: <<: *app-base + container_name: srs.app depends_on: mysql: condition: service_healthy app-test: <<: *app-base + container_name: srs.app-test depends_on: mysql-test: condition: service_healthy