From 8148f1af4bb66ba500edfa71143e5bcc75c86b46 Mon Sep 17 00:00:00 2001 From: Adrian Cederberg Date: Sun, 18 Aug 2024 20:51:37 -0600 Subject: [PATCH] fix(package): Fixed error venv instantiation. It had the wrong location. Removed ``container_name`` from ``compose.yaml`` since it matches the provided name. --- .github/workflows/commit_checks.yaml | 8 +++++--- docker/compose.yaml | 4 ++-- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/.github/workflows/commit_checks.yaml b/.github/workflows/commit_checks.yaml index 180761a..8836b9a 100644 --- a/.github/workflows/commit_checks.yaml +++ b/.github/workflows/commit_checks.yaml @@ -109,10 +109,12 @@ jobs: - name: Checkout. uses: actions/checkout@v4 - # NOTE: ``mkdir`` step is required for propper permissions on ~/.venv. + # NOTE: ``mkdir`` step is required for propper permissions on ``~/.venv`` + # (not used here). + # # Use ``docker compose --file docker/compose.yaml config | less`` # to see the config with interpolated variables from ``.env``. - # More about interpolation: https://docs.docker.com/compose/environment-variables/variable-interpolation/ + # More about interpolation: https://docs.docker.com/compose/environment-variables/variable-interpolation/ - name: Setup. run: | mkdir --parent docker/.venv @@ -134,7 +136,7 @@ jobs: docker compose \ --file docker/compose.yaml \ exec server \ - bash -c "python -m venv .venv" + bash -c "python -m venv ~/.venv" # NOTE: ``act.yaml`` defined everything necessary for the client and server. - name: Install Dependencies In Server. diff --git a/docker/compose.yaml b/docker/compose.yaml index 99f72ea..d0e2bd6 100644 --- a/docker/compose.yaml +++ b/docker/compose.yaml @@ -16,7 +16,7 @@ services: CAPTURA_FLAKEY: "${CAPTURA_FLAKEY-/home/captura/app/config/flakey.yaml}" CAPTURA_PLUGINS_USE: "${CAPTURA_PLUGINS_USE-0}" image: acederberg/captura-development:0.1.5 - container_name: captura-server + # container_name: captura-server ports: - target: 8080 published: 8080 @@ -31,7 +31,7 @@ services: - /home/captura/app/docker/.venv db: image: mysql:8 - container_name: captura-db + # container_name: captura-db environment: MYSQL_RANDOM_ROOT_PASSWORD: 1 MYSQL_DATABASE: captura