diff --git a/.gitea/workflows/builder.yaml b/.gitea/workflows/builder.yaml index bfb779f..06893b7 100644 --- a/.gitea/workflows/builder.yaml +++ b/.gitea/workflows/builder.yaml @@ -14,52 +14,11 @@ jobs: name: Check out code - uses: mr-smithers-excellent/docker-build-push@v6 - name: Build futureporn/migrations + name: Build futureporn/opentracker with: - image: futureporn/migrations + image: futureporn/opentracker tags: latest registry: gitea.futureporn.net - dockerfile: d.migrations.dockerfile - username: ${{ secrets.DOCKER_USERNAME }} - password: ${{ secrets.DOCKER_PASSWORD }} - - - uses: mr-smithers-excellent/docker-build-push@v6 - name: Build futureporn/bot - with: - image: futureporn/bot - tags: latest - registry: gitea.futureporn.net - dockerfile: d.bot.dockerfile - username: ${{ secrets.DOCKER_USERNAME }} - password: ${{ secrets.DOCKER_PASSWORD }} - - - - uses: mr-smithers-excellent/docker-build-push@v6 - name: Build futureporn/capture - with: - image: futureporn/capture - tags: latest - registry: gitea.futureporn.net - dockerfile: d.capture.dockerfile - username: ${{ secrets.DOCKER_USERNAME }} - password: ${{ secrets.DOCKER_PASSWORD }} - - - uses: mr-smithers-excellent/docker-build-push@v6 - name: Build futureporn/next - with: - image: futureporn/next - tags: latest - registry: gitea.futureporn.net - dockerfile: d.next.dockerfile - username: ${{ secrets.DOCKER_USERNAME }} - password: ${{ secrets.DOCKER_PASSWORD }} - - - uses: mr-smithers-excellent/docker-build-push@v6 - name: Build futureporn/strapi - with: - image: futureporn/strapi - tags: latest - registry: gitea.futureporn.net - dockerfile: d.strapi.dockerfile + dockerfile: dockerfiles/opentracker.dockerfile username: ${{ secrets.DOCKER_USERNAME }} password: ${{ secrets.DOCKER_PASSWORD }} diff --git a/config/deploy.yml b/config/deploy.yml index 234ede1..d2d04bd 100644 --- a/config/deploy.yml +++ b/config/deploy.yml @@ -95,20 +95,16 @@ ssh: accessories: opentracker: - build: - context: . - dockerfile: dockerfiles/opentracker.dockerfile - container_name: opentracker + image: gitea.futureporn.net/futureporn/opentracker:latest env: clear: WHITELIST_FEED_URL: https://bright.futureporn.net/torrents secret: - - SOCAT_USERNAME - - SOCAT_PASSWORD + - WHITELIST_USERNAME + - WHITELIST_PASSWORD ports: - - "6969:6969/tcp" - - "6969:6969/udp" - - "8666:8666/tcp" + - "8666:80/tcp" + - "8666:80/udp" volumes: - opentracker-etc:/etc/opentracker - opentracker-var:/var/run/opentracker