Skip to content

Commit

Permalink
Merge pull request #1602 from open-zaak/feature/docker-compose
Browse files Browse the repository at this point in the history
replace 'docker-compose' with 'docker compose'
  • Loading branch information
annashamray committed Apr 2, 2024
2 parents 98d4768 + bd877d8 commit 2b108b6
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 6 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -171,7 +171,7 @@ jobs:
- name: Bring up Alfresco
run: |
docker-compose -f docker-compose.ci.cmis.yml up -d
docker compose -f docker-compose.ci.cmis.yml up -d
docker ps -q | xargs docker stats --no-stream
- name: Install dependencies
Expand Down
8 changes: 4 additions & 4 deletions docs/installation/docker_compose.rst
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ Getting started
$ unzip main.zip
$ cd open-zaak-main
2. Start the docker containers with ``docker-compose``. If you want to run the
2. Start the docker containers with ``docker compose``. If you want to run the
containers in the background, add the ``-d`` option to the command below:

.. note:: the image build requires Docker BuildKit to be enabled - if this is not
Expand All @@ -59,7 +59,7 @@ Getting started
.. code:: bash
$ docker-compose up
$ docker compose up
[+] Running 5/5
⠿ Network open-zaak-main_default Created 0.0s
Expand All @@ -77,11 +77,11 @@ Getting started

.. code:: bash
$ docker-compose stop
$ docker compose stop
5. If you want to get newer versions, you need to ``pull`` because the
``docker-compose.yml`` contains no explicit versions:

.. code:: bash
$ docker-compose pull
$ docker compose pull
2 changes: 1 addition & 1 deletion docs/installation/index.rst
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ expertise.
production purposes
2. Deploy on a :ref:`VM, VPS or dedicated server <installation_ansible>` with Docker
Engine (or Podman) for public testing and production purposes
3. Run with :ref:`docker-compose <installation_docker_compose>` on your computer for
3. Run with :ref:`docker compose <installation_docker_compose>` on your computer for
private testing purposes
4. Run from :ref:`Python code <development_getting_started>` on your computer for
development purposes
Expand Down

0 comments on commit 2b108b6

Please sign in to comment.