Merge branch 'testing'

.drone.jsonnet

@@ -31,15 +31,15 @@ local pipeline(os, arch) = {
       },
     },
     {
-      name: "upload to docker hub " + os + "/" + arch,
+      name: "upload to gitea container registry",
-      image: "plugins/docker:" + os + "-" + arch,
+      image: "plugins/docker:latest",
       settings: {
-        repo: "git.freifunk-rhein-sieg.net/freifunk-froisdorf/ubnt-freifunk-map-api",
+        repo: "git.freifunk-rhein-sieg.net/freifunk-troisdorf/ubnt-freifunk-map-api",
         registry: "git.freifunk-rhein-sieg.net",
         username: { "from_secret": "docker_username" },
         password: { "from_secret": "docker_password" },
+        tags: ["latest"],
         auto_tag: true,
-        auto_tag_suffix: os + "-" + arch
       },
       when: {
         event: "tag"
@@ -48,67 +48,6 @@ local pipeline(os, arch) = {
   ],
 };
 
-local manifest() = {
-  kind: "pipeline",
-  type: "docker",
-  name: "manifest",
-  depends_on: ["linux/amd64"],
-  when: {
-    event: "tag"
-  },
-
-  steps: [
-    {
-      name: "publish",
-      image: "plugins/manifest",
-      settings: {
-        auto_tag: true,
-        ignore_missing: true,
-        spec: "manifest.yml",
-        username: { "from_secret": "docker_username" },
-        password: { "from_secret": "docker_password" },
-      },
-      when: {
-        event: "tag"
-      },
-    },
-  ],
-};
-
-local validateJSON() = {
-  kind: "pipeline",
-  type: "docker",
-  name: "validate json",
-  when: {
-    event: "push"
-  },
-
-  steps: [
-    {
-      name: "validate ucDevices",
-      image: "fftdf/docker-json-validate",
-      commands: [
-        "jsonlint ucDevices.json"
-      ],
-      when: {
-        event: "push"
-      },
-    },
-    {
-      name: "validate Devices",
-      image: "fftdf/docker-json-validate",
-      commands: [
-        "jsonlint devices.json",
-      ],
-      when: {
-        event: "push"
-      },
-    },
-  ],
-};
-
 [
-  pipeline("linux", "amd64"),
+  pipeline("linux", "amd64")
-  // pipeline("linux", "arm64"),
-  manifest()
 ]

README.md

@@ -1,3 +1,5 @@
+# TESTING BRANCH!!!!
+
 # Freifunk Meshviewer Unifi Access Points und Richtfunkstrecken import
 
 Dieses tool Importiert Nodes für die Freifunk Map aus den APIs UNMS (Richtfunk) & Unifi (Access Points)

manifest.yml

@@ -1,19 +0,0 @@
-image: fftdf/ffmap-ubnt-api:{{#if build.tag}}{{trimPrefix "v" build.tag}}{{else}}latest{{/if}}
-{{#if build.tags}}
-tags:
-  - "latest"
-{{#each build.tags}}
-  - {{this}}
-{{/each}}
-{{/if}}
-manifests:
-  -
-    image: git.freifunk-rhein-sieg.net/freifunk-froisdorf/ubnt-freifunk-map-api:{{#if build.tag}}{{trimPrefix "v" build.tag}}-{{/if}}linux-amd64
-    platform:
-      architecture: amd64
-      os: linux
-  # -
-  #   image: fftdf/ffmap-ubnt-api:{{#if build.tag}}{{trimPrefix "v" build.tag}}-{{/if}}linux-arm64
-  #   platform:
-  #     architecture: arm64
-  #     os: linux