clean up

Signed-off-by: Christian Richter <crichter@owncloud.com>
2022-05-12 12:01:46 +02:00
8 changed files with 46 additions and 229 deletions
--- a/.drone.star
+++ b/.drone.star
@@ -1,92 +1,16 @@
 def main(ctx):
    return [
        stepPR("amd64", "motsognir"),
-        stepPR("arm64", "motsognir"),
-        stepMergeMaster("amd64", "motsognir"),
-        stepMergeMaster("arm64", "motsognir"),
-        stepBuildWeekly("amd64", "motsognir"),
-        stepBuildWeekly("arm64", "motsognir"),
+        #stepPR("arm64", "motsognir"),
+        #stepMergeMaster("amd64", "motsognir"),
+        #stepMergeMaster("arm64", "motsognir"),

        stepPR("amd64", "webtest"),
-        stepPR("arm64", "webtest"),
-        stepMergeMaster("amd64", "webtest"),
-        stepMergeMaster("arm64", "webtest"),
-        stepBuildWeekly("amd64", "webtest"),
-        stepBuildWeekly("arm64", "webtest"),
-
-        stepPR("amd64", "unbound"),
-        stepPR("arm64", "unbound"),
-        stepMergeMaster("amd64", "unbound"),
-        stepMergeMaster("arm64", "unbound"),
-        stepBuildWeekly("amd64", "unbound"),
-        stepBuildWeekly("arm64", "unbound"),
-        
-        notify(ctx),
+        #stepPR("arm64", "webtest"),
+        #stepMergeMaster("amd64", "webtest"),
+        #stepMergeMaster("arm64", "webtest"),
    ]

-def notify(ctx):
-  return {
-        "kind": "pipeline",
-        "type": "docker",
-        "name": "matrix-notifications",
-        "clone": {
-            "disable": True,
-        },
-        "steps": [
-          {
-              "name": "notify",
-              "image": "plugins/matrix",
-              "settings": {
-                "homeserver": {
-                  "from_secret": "matrix-homeserver"
-                },
-                "roomid": {
-                  "from_secret": "matrix-room"
-                },
-                "username": {
-                  "from_secret": "matrix-user"
-                },
-                "password": {
-                  "from_secret": "matrix-password"
-                }
-              }
-            },
-        ],
-        "depends_on": [ 
-                        "docker-build-motsognir-amd64", 
-                        "docker-build-motsognir-arm64", 
-                        "docker-build-webtest-amd64",
-                        "docker-build-webtest-arm64",                  
-                        "docker-build-unbound-amd64",
-                        "docker-build-unbound-arm64",                  
-
-                        "docker-publish-motsognir-amd64", 
-                        "docker-publish-motsognir-arm64", 
-                        "docker-publish-webtest-amd64",
-                        "docker-publish-webtest-arm64",                  
-                        "docker-publish-unbound-amd64",
-                        "docker-publish-unbound-arm64",                  
-
-                        "docker-publish-weekly-motsognir-amd64", 
-                        "docker-publish-weekly-motsognir-arm64", 
-                        "docker-publish-weekly-webtest-amd64",
-                        "docker-publish-weekly-webtest-arm64",                  
-                        "docker-publish-weekly-unbound-amd64",
-                        "docker-publish-weekly-unbound-arm64",                  
-                      ],
-        "trigger": {
-            "ref": [
-                "refs/heads/master",
-                "refs/heads/release*",
-                "refs/tags/**",
-                "refs/pull/**",
-            ],
-            "status": [
-                "failure",
-                "success",
-            ],
-        },
-      }

 def stepPR(arch, path):
    return {
@@ -108,15 +32,27 @@ def stepPR(arch, path):
                    "tag": "latest-%s" % (arch),
                }
            },
+            {
+              "name": "notify-build-%s-%s" % (path, arch),
+              "image": "plugins/matrix",
+              "settings": {
+                "homeserver": "matrix.datenschmutz.space",
+                "roomid": {
+                  "from_secret": "matrix-room"
+                },
+                "username": {
+                  "from_secret": "matrix-user"
+                },
+                "password": {
+                  "from_secret": "matrix-password"
+                }
+              }
+            },
        ],
        "trigger": {
            "ref": [
                "refs/pull/**",
            ],
-            "status": [
-              "success",
-              "failure"
-            ]
        },
    }

@@ -146,41 +82,19 @@ def stepMergeMaster(arch, path):
                    }
                }
            },
-        ],
-        "trigger": {
-            "ref": [
-                "refs/heads/master",
-            ],
-            "status": [
-              "success",
-              "failure"
-            ]
-    }
-  }
-
-def stepBuildWeekly(arch, path):
-    return {
-        "kind": "pipeline",
-        "type": "docker",
-        "name": "docker-publish-weekly-%s-%s" % (path, arch),
-        "platform": {
-            "os": "linux",
-            "arch": arch,
-        },
-        "steps": [
            {
-                "name": "build-and-publish-image-%s-%s" % (path, arch),
-                "image": "plugins/docker",
+              "name": "notify-publish-%s-%s" % (path, arch),
+              "image": "plugins/matrix",
              "settings": {
-                    "dockerfile": "%s/Dockerfile" % (path),
-                    "repo": "dragonchaser/%s" % (path),
-                    "dry_run": "false",
-                    "tag": "latest-%s" % (arch),
+                "homeserver": "matrix.datenschmutz.space",
+                "roomid": {
+                  "from_secret": "matrix-room"
+                },
                "username": {
-                        "from_secret": "dockerhub-user"
+                  "from_secret": "matrix-user"
                },
                "password": {
-                        "from_secret": "dockerhub-password"
+                  "from_secret": "matrix-password"
                }
              }
            },
@@ -189,11 +103,5 @@ def stepBuildWeekly(arch, path):
            "ref": [
                "refs/heads/master",
            ],
-            "event": [
-              "cron"
-            ],
-            "cron": [
-              "weekly"
-            ]
        },
    }
--- a/README.md
+++ b/README.md
@@ -1,12 +1,9 @@
 # dockerhub-autobuild

-[![Build Status](https://drone.services.datenschmutz.space/api/badges/dragonchaser/dockerhub-autobuild/status.svg)](https://drone.services.datenschmutz.space/dragonchaser/dockerhub-autobuild)
-
 This repo contains Dockerfiles used for autobuilding on Dockerhub.
 No guarantee for completeness or functionality.

 |URL|Folder|Description|x86_64|aarch64|
 |:--|:-----|:----------|:----:|:-----:|
-| [dragonchaser/webtest](https://hub.docker.com/r/dragonchaser/webtest)     | webtest   | A small container running ruby WebRick and serves static content from /web | x      | x       |
-| [dragonchaser/motsognir](https://hub.docker.com/r/dragonchaser/motsognir) | motsognir | A container for the motsognir gopher server                                | x      | x       |
-| [dragonchaser/unbound](https://hub.docker.com/r/dragonchaser/unbound)     | motsognir | A container for unbound dns                                                | x      | x       |
+|[dragonchaser/webtest](https://hub.docker.com/r/dragonchaser/webtest)|webtest|A small container running ruby WebRick and serves static content from /web|x||x|
+|[dragonchaser/motsognir](https://hub.docker.com/r/dragonchaser/motsognir) |motsognir|A container for the motsognir gopher server|x||x|
--- a/motsognir/Dockerfile
+++ b/motsognir/Dockerfile
@@ -9,7 +9,7 @@ WORKDIR /build
 RUN wget "https://downloads.sourceforge.net/project/motsognir/v${VERSION}/${TARBALL}" \
  && tar xfv "${TARBALL}"
 RUN cd $(echo "${TARBALL}" | sed -e "s/.tar.xz//g") && make all && make install
-RUN apt-get -y purge build-essential
+RUN apt-get -y purge wget build-essential
 RUN rm -Rfv /etc/apt/sources.list.*
 RUN rm -Rfv /build
 RUN useradd -ms /bin/bash -d /gopher gopher
--- a/motsognir/README.md
+++ b/motsognir/README.md
@@ -4,16 +4,16 @@ A container for the motsognir gopher server http://motsognir.sourceforge.net/

 ## Running locally

-**amd64**
+**x86_64**

 ```
-$> docker run -p 70:70 -v /path/to/you/local/gopherfolder:/gopher dragonchaser/motsognir:latest-amd64 
+$> docker run -p 70:70 -v /path/to/you/local/gopherfolder:/gopher dragonchaser/motsognir:latest 
 ```

-**arm64**
+**arm32v7**

 ```
-$> docker run -p 70:70 -v /path/to/you/local/gopherfolder:/gopher dragonchaser/motsognir:latest-arm64
+$> docker run -p 70:70 -v /path/to/you/local/gopherfolder:/gopher dragonchaser/motsognir:latest-arm32v7 
 ```

 **Notes:** 
--- a/unbound/Dockerfile
+++ b/unbound/Dockerfile
@@ -1,8 +0,0 @@
-FROM debian:latest
-LABEL maintainer="dragonchaser <autobuilds@datenschmutz.space>"
-EXPOSE 5335/udp
-RUN apt-get update \
-  && apt-get -y install unbound netcat-traditional
-COPY unbound/config.conf /etc/unbound/unbound.conf.d/
-COPY unbound/entrypoint.sh /
-ENTRYPOINT /entrypoint.sh
--- a/unbound/README.md
+++ b/unbound/README.md
@@ -1,29 +0,0 @@
-# unbound
-
-A container for unbound https://github.com/NLnetLabs/unbound
-
-## Running locally
-
-**amd64**
-
-```
-$> docker run \
-    -p 53:53 \
-    -v /path/to/you/local/unboundfolder/conf:/etc/unbound \
-    -v /path/to/you/local/unboundfolder/lib:/var/lib/unbound \
-    dragonchaser/unbound:latest-amd64 
-```
-
-**arm64**
-
-```
-$> docker run \
-    -p 53:53 \
-    -v /path/to/you/local/unboundfolder/conf:/etc/unbound \
-    -v /path/to/you/local/unboundfolder/lib:/var/lib/unbound \
-    dragonchaser/unbound:latest-arm64 
-``**
-
-***Note:***
-
-The container will expose the dns port on 5335.
--- a/unbound/config.conf
+++ b/unbound/config.conf
@@ -1,48 +0,0 @@
-server:
-  access-control: 0.0.0.0/0 allow
-  interface: 0.0.0.0
-  port: 5335
-  do-ip6: no
-  do-ip4: yes
-  do-udp: yes
-  do-tcp: yes
-  # Set number of threads to use
-  num-threads: 8
-  # Hide DNS Server info
-  hide-identity: yes
-  hide-version: yes
-  # Limit DNS Fraud and use DNSSEC
-  harden-glue: yes
-  harden-dnssec-stripped: yes
-  harden-referral-path: yes
-  use-caps-for-id: yes
-  harden-algo-downgrade: yes
-  qname-minimisation: yes
-  aggressive-nsec: yes
-  rrset-roundrobin: yes
-  # Minimum lifetime of cache entries in seconds
-  cache-min-ttl: 300
-  # Configure TTL of Cache
-  cache-max-ttl: 14400
-  # Optimizations
-  msg-cache-slabs: 8
-  rrset-cache-slabs: 8
-  infra-cache-slabs: 8
-  key-cache-slabs: 8
-  serve-expired: yes
-  serve-expired-ttl: 3600
-  edns-buffer-size: 1232
-  prefetch: yes
-  prefetch-key: yes
-  unwanted-reply-threshold: 10000000
-  # Set cache size
-  rrset-cache-size: 256m
-  msg-cache-size: 128m
-  # increase buffer size so that no messages are lost in traffic spikes
-  #so-rcvbuf: 1m
-  private-address: 192.168.0.0/16
-  private-address: 169.254.0.0/16
-  private-address: 172.16.0.0/12
-  private-address: 10.0.0.0/8
-  private-address: fd00::/8
-  private-address: fe80::/10
--- a/unbound/entrypoint.sh
+++ b/unbound/entrypoint.sh
@@ -1,3 +0,0 @@
-#!/bin/bash
-unbound-checkconf
-unbound -d