Skip to content

Commit 8d2a2e1

Browse files
committed
chore: use docker compose plugin instead of legacy docker-compose
Followup to #231
1 parent 8110fd9 commit 8d2a2e1

14 files changed

+19
-18
lines changed

README.rst

+1-1
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ Getting started
5050

5151
.. code-block:: shell
5252
53-
docker-compose up
53+
docker compose up
5454
5555
5. For more detailed instructions and configuration visit https://docs.weblate.org/en/latest/admin/install/docker.html
5656

test-admin

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
11
#!/bin/sh
2-
docker-compose exec -T --user weblate weblate weblate createadmin --update || exit 1
2+
docker compose exec -T --user weblate weblate weblate createadmin --update || exit 1

test-boot

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
11
#!/bin/sh
2-
docker-compose up -d
2+
docker compose up -d

test-checks

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
#!/bin/sh
2-
docker-compose exec -T \
2+
docker compose exec -T \
33
--user weblate \
44
--env WEBLATE_SILENCED_SYSTEM_CHECKS=weblate.E003,weblate.E011,weblate.E012,weblate.E013,weblate.E017,security.W004,security.W008,security.W012,security.W018,weblate.I021,weblate.E016,weblate.I028,weblate.C030 \
55
weblate weblate check --deploy --fail-level WARNING

test-commands

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
#!/bin/sh
22
set -e
3-
docker-compose exec -T \
3+
docker compose exec -T \
44
--user weblate \
55
weblate licensee --help

test-health

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
#!/bin/sh
2-
docker-compose ps
3-
docker-compose exec -T \
2+
docker compose ps
3+
docker compose exec -T \
44
--user weblate \
55
weblate /app/bin/health_check

test-inspect

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
#!/bin/sh
2-
CONTAINER=$(docker-compose ps | grep _weblate_ | sed 's/[[:space:]].*//')
2+
CONTAINER=$(docker compose ps | grep -F -e -weblate- | sed 's/[[:space:]].*//')
33
docker inspect "$CONTAINER"

test-logs

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,3 @@
11
#!/bin/sh
2-
docker-compose logs
2+
docker compose logs
3+
docker compose ps

test-online

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ RET=$?
1515
curl --insecure --verbose --fail --max-time 3 --output /dev/null "${URL}static/weblate-128.png"
1616
RET2=$?
1717
# Display logs so far
18-
docker-compose logs
18+
docker compose logs
1919

2020
if [ $RET2 -ne 0 ] || [ $RET -ne 0 ] ; then
2121
exit 1

test-pip

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
11
#!/bin/sh
2-
docker-compose exec -T weblate pip3 list --no-cache-dir --disable-pip-version-check
2+
docker compose exec -T weblate pip3 list --no-cache-dir --disable-pip-version-check

test-saml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
11
#!/bin/sh
2-
docker-compose exec -T weblate openssl x509 -in /app/data/ssl/saml.crt -text -noout
2+
docker compose exec -T weblate openssl x509 -in /app/data/ssl/saml.crt -text -noout

test-stop

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
11
#!/bin/sh
2-
docker-compose down
2+
docker compose down

test-supervisor

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
#!/bin/sh
2-
docker-compose exec -T weblate supervisorctl status all
2+
docker compose exec -T weblate supervisorctl status all
33
RET=$?
44
# The 3 happens with EXITED check and supervisor 4
55
if [ $RET -ne 0 ] && [ $RET -ne 3 ] ; then
6-
docker-compose logs
6+
docker compose logs
77
exit 1
88
fi

test-tests

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
#!/bin/sh
22
set -e
3-
docker-compose exec -T --user weblate --env CI_BASE_DIR=/tmp --env CI_DATABASE=postgresql --env CI_DB_HOST=database --env CI_DB_NAME=weblate --env CI_DB_USER=weblate --env CI_DB_PASSWORD=weblate --env DJANGO_SETTINGS_MODULE=weblate.settings_test weblate weblate collectstatic --noinput
4-
docker-compose exec -T --user weblate --env CI_BASE_DIR=/tmp --env CI_DATABASE=postgresql --env CI_DB_HOST=database --env CI_DB_NAME=weblate --env CI_DB_USER=weblate --env CI_DB_PASSWORD=weblate --env DJANGO_SETTINGS_MODULE=weblate.settings_test weblate weblate test --noinput weblate
3+
docker compose exec -T --user weblate --env CI_BASE_DIR=/tmp --env CI_DATABASE=postgresql --env CI_DB_HOST=database --env CI_DB_NAME=weblate --env CI_DB_USER=weblate --env CI_DB_PASSWORD=weblate --env DJANGO_SETTINGS_MODULE=weblate.settings_test weblate weblate collectstatic --noinput
4+
docker compose exec -T --user weblate --env CI_BASE_DIR=/tmp --env CI_DATABASE=postgresql --env CI_DB_HOST=database --env CI_DB_NAME=weblate --env CI_DB_USER=weblate --env CI_DB_PASSWORD=weblate --env DJANGO_SETTINGS_MODULE=weblate.settings_test weblate weblate test --noinput weblate
55
RET=$?
66
if [ $RET -ne 0 ] ; then
7-
docker-compose logs
7+
docker compose logs
88
exit $RET
99
fi

0 commit comments

Comments
 (0)