diff --git a/.gitea/workflows/tests.yaml b/.gitea/workflows/tests.yaml index c51a5e1..43cd707 100644 --- a/.gitea/workflows/tests.yaml +++ b/.gitea/workflows/tests.yaml @@ -18,13 +18,9 @@ jobs: # when we are working with nektos/act, we must use the IP address of the service container. # this causes issues because nektos/act will not be able to find test-db:5432 but act_runner can. # this means we have inconsistent behavior across testing environments, which is bad. - # our workaround is to use localhost on local dev, and the dns name on gitea act_runner. - create_volumes: - name: Create Docker Volumes - runs-on: ubuntu-22.04 - steps: - - run: | - docker volume ls | grep -q aquatic || docker volume create aquatic + # our workaround is to reference service containers two different ways. + # - when running nektos/act on localhost, we reference the service as localhost:. + # - when running gitea act_runner on gitea, we reference the service's dns name. test_phoenix: env: @@ -78,7 +74,6 @@ jobs: tracker-helper: image: gitea.futureporn.net/futureporn/tracker-helper:latest - # options: --volumes-from ${{ env.JOB_CONTAINER_NAME }} ports: - 5063:5063 env: @@ -135,6 +130,14 @@ jobs: # with: # args: /usr/bin/pg_isready --host test-db --port 5432 + - name: show the env + run: | + env | sort + + # - name: show the JOB_CONTAINER_ID + # run: + # options: --volumes-from ${{ env.JOB_CONTAINER_NAME }} + - name: Setup FFmpeg uses: FedericoCarboni/setup-ffmpeg@v3 diff --git a/docker-compose.yml b/docker-compose.yml index 9eb3a42..b536795 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -1,18 +1,27 @@ services: - opentracker: + aquatic: build: - context: ./apps/opentracker - container_name: opentracker - environment: - - WHITELIST_FEED_URL=http://bright:4000/torrents - env_file: - - .kamal/secrets.development + context: ./apps/aquatic ports: - - "6969:6969/tcp" - - "6969:6969/udp" + - "3003:3003/udp" + - "9000:9000/tcp" volumes: - - opentracker-etc:/etc/opentracker + - aquatic + + # opentracker: + # build: + # context: ./apps/opentracker + # container_name: opentracker + # environment: + # - WHITELIST_FEED_URL=http://bright:4000/torrents + # env_file: + # - .kamal/secrets.development + # ports: + # - "6969:6969/tcp" + # - "6969:6969/udp" + # volumes: + # - opentracker-etc:/etc/opentracker # qbittorrent: # build: @@ -117,4 +126,5 @@ volumes: pg_data: redis_data: cache: - opentracker-etc: \ No newline at end of file + opentracker-etc: + aquatic: \ No newline at end of file