Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Workflow + docker update #1364

Merged
merged 2 commits into from
Sep 20, 2024
Merged

Workflow + docker update #1364

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8e3e6c5
docker fix
jan-stanek Sep 20, 2024
4ea6985
pipeline fix
jan-stanek Sep 20, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 7 additions & 7 deletions .github/workflows/test.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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: .
Expand All @@ -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: .
Expand All @@ -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: .
Expand All @@ -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: .
Expand All @@ -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: .
Expand All @@ -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: .
Expand Down
2 changes: 0 additions & 2 deletions docker-compose.override.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
version: "3.4"

services:
app:
ports:
Expand Down
3 changes: 2 additions & 1 deletion docker-compose.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@ volumes:

x-app-base:
&app-base
container_name: srs.app
image: skaut/lebeda:8.1
volumes:
- www:/var/www
Expand All @@ -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
Expand Down