From 01c09edb17cf0e1e3c003c5f299e4e538da69b84 Mon Sep 17 00:00:00 2001
From: jkirkcaldy <josh@themainframe.co.uk>
Date: Wed, 17 Jan 2024 16:28:18 +0000
Subject: [PATCH] dev files

---
 .devcontainer.json         | 24 +++++++++++++++++
 repository.yaml            |  3 +++
 technitium-dns/Dockerfile  | 55 +++++++++++++++++++-------------------
 technitium-dns/config.yaml | 18 -------------
 4 files changed, 54 insertions(+), 46 deletions(-)
 create mode 100644 .devcontainer.json
 create mode 100644 repository.yaml

diff --git a/.devcontainer.json b/.devcontainer.json
new file mode 100644
index 0000000..0b4e49c
--- /dev/null
+++ b/.devcontainer.json
@@ -0,0 +1,24 @@
+{
+  "name": "Technitium DNS Server",
+  "image": "https://git.themainframe.co.uk/josh/addon-technitium:latest",
+  "appPort": ["53:53", "5380:5380"],
+  "postStartCommand": "bash /etc/dns",
+  "runArgs": ["-e", "GIT_EDITOR=code --wait", "--privileged"],
+  "remoteUser":"root",
+  "containerEnv": {
+    "WORKSPACE_DIRECTORY": "${containerWorkspaceFolder}"
+  },
+  "mounts": ["type=volume,target=/var/lib/docker"],
+  "settings": {
+    "terminal.integrated.profiles.linux": {
+      "bash": {
+        "path": "/usr/bin/bash"
+      }
+    },
+    "terminal.integrated.defaultProfile.linux": "bash",
+    "editor.formatOnPaste": false,
+    "editor.formatOnSave": true,
+    "editor.formatOnType": true,
+    "files.trimTrailingWhitespace": true
+  }
+}
\ No newline at end of file
diff --git a/repository.yaml b/repository.yaml
new file mode 100644
index 0000000..f45c2f8
--- /dev/null
+++ b/repository.yaml
@@ -0,0 +1,3 @@
+name: Technitium DNS Server
+url: 'https://git.themainframe.co.uk/josh/addon-technitium'
+maintainer: josh <josh@themainframe.co.uk>
\ No newline at end of file
diff --git a/technitium-dns/Dockerfile b/technitium-dns/Dockerfile
index 4dc5993..f19a6bf 100644
--- a/technitium-dns/Dockerfile
+++ b/technitium-dns/Dockerfile
@@ -1,43 +1,39 @@
 FROM mcr.microsoft.com/dotnet/aspnet:7.0
-LABEL maintainer="michaelpellegrini@protonmail.com"
+LABEL product="Technitium DNS Server"
+LABEL vendor="Technitium"
+LABEL email="support@technitium.com"
+LABEL project_url="https://technitium.com/dns/"
+LABEL github_url="https://github.com/TechnitiumSoftware/DnsServer"
 
-ENV TZ=America/New_York
+WORKDIR /opt/technitium/dns/
 
-WORKDIR /app
-
-RUN apt-get update; apt-get install curl -y; \
-curl https://download.technitium.com/dns/DnsServerPortable.tar.gz --output DnsServerPortable.tar.gz; \
+RUN apt update; apt install curl -y; \
 curl https://packages.microsoft.com/config/debian/11/packages-microsoft-prod.deb --output packages-microsoft-prod.deb; \
-gunzip /app/DnsServerPortable.tar.gz; tar -xf /app/DnsServerPortable.tar; \
-dpkg -i packages-microsoft-prod.deb; apt-get update; apt install libmsquic=2.1.8 -y;  apt-get clean -y; \
-ln -sf /usr/share/zoneinfo/$TZ /etc/localtime; rm DnsServerPortable.tar packages-microsoft-prod.deb 
+dpkg -i packages-microsoft-prod.deb; \
+rm packages-microsoft-prod.deb
 
+RUN apt update; apt install dnsutils libmsquic -y; apt clean -y;
+
+COPY ./DnsServerApp/bin/Release/publish/ .
+
+EXPOSE 5380/tcp
+EXPOSE 53443/tcp
 EXPOSE 53/udp
 EXPOSE 53/tcp
-EXPOSE 67/udp
-EXPOSE 80/tcp
-EXPOSE 443/tcp
-EXPOSE 443/udp
-EXPOSE 853/tcp
 EXPOSE 853/udp
-EXPOSE 5380/tcp
+EXPOSE 853/tcp
+EXPOSE 443/udp
+EXPOSE 443/tcp
+EXPOSE 80/tcp
 EXPOSE 8053/tcp
-EXPOSE 53443/tcp
+EXPOSE 67/udp
 
-VOLUME [ "/app/config" ]
-VOLUME [ "/etc/ssl" ]
-VOLUME [ "/app/config/logs" ]
+VOLUME ["/etc/dns"]
+
+STOPSIGNAL SIGINT
 
 
 
-# Build arguments
-ARG BUILD_ARCH
-ARG BUILD_DATE
-ARG BUILD_DESCRIPTION
-ARG BUILD_NAME
-ARG BUILD_REF
-ARG BUILD_REPOSITORY
-ARG BUILD_VERSION
 
 # Labels
 LABEL \
@@ -58,4 +54,7 @@ LABEL \
     org.opencontainers.image.created=${BUILD_DATE} \
     org.opencontainers.image.revision=${BUILD_REF} \
     org.opencontainers.image.version=${BUILD_VERSION}
-ENTRYPOINT [ "dotnet", "/app/DnsServerApp.dll" ]
\ No newline at end of file
+
+
+ENTRYPOINT ["/usr/bin/dotnet", "/opt/technitium/dns/DnsServerApp.dll"]
+CMD ["/etc/dns"]
\ No newline at end of file
diff --git a/technitium-dns/config.yaml b/technitium-dns/config.yaml
index 45fdf3b..dc5bca6 100644
--- a/technitium-dns/config.yaml
+++ b/technitium-dns/config.yaml
@@ -3,14 +3,10 @@ name: technitium DNS
 version: dev
 slug: technitium_dns
 description: A DNS/DHCP server with addblocking
-url: todo
-codenotary: todo
-startup: system
 arch:
   - aarch64
   - amd64
   - armv7
-hassio_api: false
 init: false
 ports:
   123/udp: 123
@@ -38,17 +34,3 @@ ports_description:
   5380/tcp: 5380
   8053/tcp: 8053
   53443/tcp: 53433
-options:
-  set_system_clock: true
-  mode: pool
-  ntp_pool: pool.ntp.org
-  ntp_server:
-    - 54.39.13.155
-    - briareus.schulte.org
-schema:
-  log_level: list(trace|debug|info|notice|warning|error|fatal)?
-  set_system_clock: bool
-  ntp_pool: str?
-  ntp_server:
-    - str?
-  mode: list(pool|server)