diff --git a/.github/workflows/docker-configs/ldap-docker-compose.yml b/.github/workflows/docker-configs/ldap-docker-compose.yml index a50b04d..5cf12a8 100644 --- a/.github/workflows/docker-configs/ldap-docker-compose.yml +++ b/.github/workflows/docker-configs/ldap-docker-compose.yml @@ -2,7 +2,7 @@ version: '2' services: openldap: - image: docker.io/bitnami/openldap:2.6 + image: docker.io/bitnami/openldap:latest ports: - '1389:1389' - '1636:1636' diff --git a/.github/workflows/docs_publish.yml b/.github/workflows/docs_publish.yml index 8b0e67b..49d73c3 100644 --- a/.github/workflows/docs_publish.yml +++ b/.github/workflows/docs_publish.yml @@ -22,6 +22,9 @@ jobs: uses: actions/setup-python@v2 with: python-version: ${{ matrix.python-version }} + - uses: shogo82148/actions-setup-redis@v1 + with: + redis-version: "7.x" - name: Install dependencies run: | sudo apt install redis diff --git a/.github/workflows/testing.yml b/.github/workflows/testing.yml index 27a504e..b7d9d54 100644 --- a/.github/workflows/testing.yml +++ b/.github/workflows/testing.yml @@ -8,7 +8,7 @@ jobs: runs-on: ubuntu-latest strategy: matrix: - python-version: ["3.9", "3.10", "3.11", "3.12", "3.13"] + python-version: ["3.10", "3.11", "3.12", "3.13"] # pydantic-version: ["<2.0.0", ">=2.0.0"] # exclude: # - python-version: "3.9" @@ -29,9 +29,18 @@ jobs: uses: actions/setup-python@v2 with: python-version: ${{ matrix.python-version }} + - uses: shogo82148/actions-setup-redis@v1 + with: + redis-version: "7.x" - name: Install dependencies run: | - sudo apt install redis + # sudo apt install redis + + pushd .. + git clone https://github.com/bitnami/containers.git + cd containers/bitnami/openldap/2.6/debian-12 + docker build -t bitnami/openldap:latest . + popd # Start LDAP source start_LDAP.sh diff --git a/docs/source/control_re_manager.rst b/docs/source/control_re_manager.rst index a082120..789e2bb 100644 --- a/docs/source/control_re_manager.rst +++ b/docs/source/control_re_manager.rst @@ -430,7 +430,7 @@ The following WebSockets are currently implemented: For example, the console output stream may be received by connecting to the socket with ``ws://localhost:60610/api/console_output/ws`` URI. -Currently ``/info/ws`` and ``/status/ws`` sockets are streaming the same sequence of RE Manager +Currently ``/info/ws`` and ``/status/ws`` sockets are streaming the same sequence of RE Manager status messages. Additional messages may be added to the system info stream in the future. Message format for console output messages:: diff --git a/start_LDAP.sh b/start_LDAP.sh index d71c662..8b612de 100644 --- a/start_LDAP.sh +++ b/start_LDAP.sh @@ -3,6 +3,6 @@ set -e # Start LDAP server in docker container -sudo docker pull bitnami/openldap:latest +# sudo docker pull osixia/openldap:latest sudo docker compose -f .github/workflows/docker-configs/ldap-docker-compose.yml up -d sudo docker ps