From 99053f35d06a3b70d39a459e9df146286e83d2bd Mon Sep 17 00:00:00 2001 From: jbergner Date: Mon, 9 Jun 2025 16:40:50 +0200 Subject: [PATCH] fixes network, added newt, fixed Dockerfile and Workflow --- .gitea/workflows/registry.yml | 18 +----------------- compose.yml | 18 ++++++++++++++++++ 2 files changed, 19 insertions(+), 17 deletions(-) diff --git a/.gitea/workflows/registry.yml b/.gitea/workflows/registry.yml index 7f76155..20912ac 100644 --- a/.gitea/workflows/registry.yml +++ b/.gitea/workflows/registry.yml @@ -43,25 +43,9 @@ jobs: with: context: . file: ./Dockerfile - build-args: | - CONTENT_REPO=https://git.send.nrw/b1tsblog/blogcontent.git - CONTENT_REF=main platforms: | linux/amd64 push: true tags: | # replace it with your local IP and tags ${{ vars.DOCKER_REGISTRY }}/${{ env.DOCKER_ORG }}/${{ steps.meta.outputs.REPO_NAME }}:${{ steps.meta.outputs.REPO_VERSION }} - ${{ vars.DOCKER_REGISTRY }}/${{ env.DOCKER_ORG }}/${{ steps.meta.outputs.REPO_NAME }}:${{ env.DOCKER_LATEST }} - - name: Build and push StarCitizen - uses: docker/build-push-action@v4 - with: - context: . - file: ./Dockerfile - build-args: | - CONTENT_REPO=https://git.send.nrw/b1tsblog/sccontent.git - CONTENT_REF=main - platforms: | - linux/amd64 - push: true - tags: | # replace it with your local IP and tags - ${{ vars.DOCKER_REGISTRY }}/${{ env.DOCKER_ORG }}/${{ steps.meta.outputs.REPO_NAME }}:sc-${{ env.DOCKER_LATEST }} \ No newline at end of file + ${{ vars.DOCKER_REGISTRY }}/${{ env.DOCKER_ORG }}/${{ steps.meta.outputs.REPO_NAME }}:${{ env.DOCKER_LATEST }} \ No newline at end of file diff --git a/compose.yml b/compose.yml index 70c791a..fb7b867 100644 --- a/compose.yml +++ b/compose.yml @@ -5,6 +5,8 @@ services: api: build: . container_name: ipblock-api + networks: + - flod_nw depends_on: - redis environment: @@ -21,10 +23,26 @@ services: redis: image: redis:7-alpine container_name: ipblock-redis + networks: + - flod_nw command: ["redis-server", "--save", "", "--appendonly", "no"] # reine In-Memory-Instanz #volumes: #- redis-data:/data # falls du doch Persistence willst restart: unless-stopped + + newt: + image: fosrl/newt + container_name: newt + networks: + - flod_nw + restart: unless-stopped + environment: + - PANGOLIN_ENDPOINT= + - NEWT_ID= + - NEWT_SECRET= + +networks: + flod_nw #volumes: #redis-data: