From 9ec73992db35565a9f8bac56ce2cf2c60c00efdc Mon Sep 17 00:00:00 2001
From: Hendrik Behme <h.behme@inwebco.com>
Date: Thu, 8 Aug 2024 01:34:29 +0200
Subject: [PATCH] removed old docker file and added gitea runner

---
 .gitea/gitea-ci.yaml | 25 ++++++++++++++++++++++
 docker-compose.yaml  | 51 ++++++--------------------------------------
 docker-compose.yml   | 14 ------------
 3 files changed, 31 insertions(+), 59 deletions(-)
 create mode 100644 .gitea/gitea-ci.yaml
 delete mode 100644 docker-compose.yml

diff --git a/.gitea/gitea-ci.yaml b/.gitea/gitea-ci.yaml
new file mode 100644
index 0000000..60f506f
--- /dev/null
+++ b/.gitea/gitea-ci.yaml
@@ -0,0 +1,25 @@
+name: Build docker image
+run-name: ${{ gitea.actor }} is runs ci pipeline
+on: [ push ]
+
+jobs:
+  push:
+    runs-on: ubuntu-latest
+    needs: build
+    if: gitea.ref == 'refs/heads/master'
+    steps:
+      - uses: https://github.com/actions/checkout@v4
+      - name: Set up Docker Buildx
+        uses: https://github.com/docker/setup-buildx-action@v3
+        with:
+          config-inline: |
+            [registry."git.whimsoc.dev"]
+              http = true
+              insecure = true            
+      - name: Build and push Docker image
+        uses: https://github.com/docker/build-push-action@v5
+        with:
+          context: .
+          file: ./Dockerfile
+          push: true
+          tags: "git.whimsoc.dev/hendrik/openstreetmap-tile-server:${{gitea.sha}},git.whimsoc.dev/hendrik/openstreetmap-tile-server:latest"
diff --git a/docker-compose.yaml b/docker-compose.yaml
index c0bfd35..c7bf8f0 100644
--- a/docker-compose.yaml
+++ b/docker-compose.yaml
@@ -1,64 +1,25 @@
 services:
   map:
-    image: overv/openstreetmap-tile-server
+    image: git.whimsoc.dev/hendrik/openstreetmap-tile-server:latest
     environment:
       - UPDATES=enabled
-      - MAX_INTERVAL_SECONDS=600
-      - REPLICATION_URL=https://planet.openstreetmap.org/replication/minute/
-        #     - DOWNLOAD_PBF=https://download.geofabrik.de/europe/dach-latest.osm.pbf
-        #     - DOWNLOAD_POLY=https://download.geofabrik.de/europe/dach.poly
+      - MAX_INTERVAL_SECONDS=3600
+      - REPLICATION_URL=https://planet.openstreetmap.org/replication/hour/
       - THREADS=10
-      - OSM2PGSQL_EXTRA_ARGS=-C 8196 
-      - FLAT_NODES=enabled
-        #   deploy:
-        #      replicas: 4
+      - OSM2PGSQL_EXTRA_ARGS=-C 8196
       - ALLOW_CORS=enabled
       - TILESIZE=512
     volumes:
       - osm-data:/data/database/
       - osm-tiles:/data/tiles/ 
       - ./run.sh:/run.sh
-        #    ports:
-        #      - "8080:80"
+    ports:
+      - "8080:80"
     command: "run"
     shm_size: 2g
-    networks:
-      - traefik
-    labels:
-      - "traefik.enable=true"
-      - "traefik.docker.network=traefik-docker_default"
-      - "traefik.http.routers.openstreetmap-tile-server.rule=Host(`${VIRTUAL_HOST}`)"
-      - "traefik.http.routers.openstreetmap-tile-server.entrypoints=websecure"
-      - "traefik.http.routers.openstreetmap-tile-server.tls.certresolver=letsencrypt"
-      - "traefik.http.services.openstreetmap-tile-server.loadbalancer.server.port=80"
-      - "traefik.http.routers.openstreetmap-tile-server.tls=true"
-
-  import:
-    image: overv/openstreetmap-tile-server
-    environment:
-      - UPDATES=enabled
-      - MAX_INTERVAL_SECONDS=600
-      - REPLICATION_URL=https://planet.openstreetmap.org/replication/minute/
-      - DOWNLOAD_PBF=https://download.geofabrik.de/europe/dach-latest.osm.pbf
-      - DOWNLOAD_POLY=https://download.geofabrik.de/europe/dach.poly
-      - THREADS=10
-      - FLAT_NODES=enabled
-      - OSM2PGSQL_EXTRA_ARGS=-C 8196
-    dns: 1.1.1.1
-    volumes:
-      - osm-data:/data/database/
-      - osm-tiles:/data/tiles/
-    command: "import"
-    shm_size: 2g
 
 volumes:
   osm-tiles:
     external: true
   osm-data:
     external: true
-
-networks:
-  traefik:
-    external: true
-    name: traefik-docker_default
-
diff --git a/docker-compose.yml b/docker-compose.yml
deleted file mode 100644
index 684723c..0000000
--- a/docker-compose.yml
+++ /dev/null
@@ -1,14 +0,0 @@
-version: '3'
-
-services:
-  map:
-    image: overv/openstreetmap-tile-server
-    volumes:
-      - osm-data:/data/database/
-    ports:
-      - "8080:80"
-    command: "run"
-
-volumes:
-  osm-data:
-    external: true