Skip to content

Commit

Permalink
Maintenance: fix GitHub actions
Browse files Browse the repository at this point in the history
  • Loading branch information
mgruner committed Aug 19, 2024
1 parent 4656401 commit 344f6fd
Show file tree
Hide file tree
Showing 5 changed files with 9 additions and 9 deletions.
2 changes: 1 addition & 1 deletion .github/ISSUE_TEMPLATE.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
Hi there - thanks for filling an issue. Please ensure the following things before creating an issue - thank you! 🤓
- Check the repository. Please only create issue here that concern the Zammad Docker setup. Use the other repositories for other issues.
- Make sure to use the latest version of Zammads Docker containers via: docker-compose pull
- Make sure to use the latest version of Zammad's Docker containers via: docker compose pull
- Please write the issue in english
* The upper textblock will be removed automatically when you submit your issue *
Expand Down
2 changes: 1 addition & 1 deletion .github/tests.sh
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
set -o errexit
set -o pipefail

docker-compose logs --timestamps --follow &
docker compose logs --timestamps --follow &

until (curl -I --silent --fail localhost:8080 | grep -iq "HTTP/1.1 200 OK"); do
echo "wait for zammad to be ready..."
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/ci-remote-image.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -14,11 +14,11 @@ jobs:
- name: Checkout
uses: actions/checkout@v4

- name: pull docker-compose images
run: docker-compose pull
- name: pull docker compose images
run: docker compose pull

- name: run docker-compose up
run: docker-compose up --detach
- name: run docker compose up
run: docker compose up --detach

- name: add autowizard file
run: docker cp .github/auto_wizard.json zammad-docker-compose_zammad-railsserver_1:/opt/zammad/tmp
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/ci.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,8 @@ jobs:
- name: Checkout
uses: actions/checkout@v4

- name: lint zammad docker-compose file
run: docker-compose config
- name: lint zammad docker compose file
run: docker compose config

super-linter:
runs-on: ubuntu-22.04
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ To run Zammad behind a reverse proxy, we provide `docker-compose.proxy-example.y
1. Copy `./.examples/proxy/docker-compose.proxy-example.yml` to your own configuration, e.g. `./docker-compose.prod.yml`
`cp ./.examples/proxy/docker-compose.proxy-example.yml ./docker-compose.prod.yml`
2. Modify the environment variable `VIRTUAL_HOST` and the name of the external network in `./docker-compose.prod.yml` to fit your environment.
3. Run docker-composer commands with the default and your configuration, e.g. `docker-compose -f docker-compose.yml -f docker-compose.prod.yml up -d`
3. Run docker-composer commands with the default and your configuration, e.g. `docker compose -f docker-compose.yml -f docker-compose.prod.yml up -d`

See `.examples/proxy/docker-compose.yml` for an example proxy project.

Expand Down

0 comments on commit 344f6fd

Please sign in to comment.