Add -http2 -cacert options

.gitignore

@@ -6,6 +6,8 @@
 # Folders
 _obj
 _test
+vendor/
+.idea/
 
 # Architecture specific extensions/prefixes
 *.[568vq]

.travis.yml

@@ -1,27 +1,10 @@
 language: go
 go:
-- "1.9"
-- "1.10"
+- '1.13'
+- '1.14'
+- '1.14.2'
 - tip
+before_install: cd v5
 install:
-- go get -u -v github.com/fardog/secureoperator
-- go get -u -v github.com/fardog/secureoperator/cmd
-- go get -u -v github.com/fardog/secureoperator/cmd/secure-operator
-before_deploy: "make release"
-deploy:
-  provider: releases
-  api_key:
-    secure: vFsdmPnhrs2vRmw83aeMOk7UFHHBtnTjY9WmY96Onannur4d7Rwg58Lmz7gwsx2z/6pD9Ghbd9/eloqUrCIubPzJVvhCU+DJ+n4GnxR9bLvAS6ekY5UedaBAEdVdpcr5bS84xIdYWBD6PgaJs6/sZazgEShDKzpcL9wpv5pOZNfSLtmYYkKlzsPScUehGLhVwBstKD1sxDBxjV9nYDgX3zwZKPWz8zqPxyzUq4evPxDYuh9aUILqObwSfZy4AEuBRFnpXLNdZtpCPK3VAT3PC9XYbBqauQAOs3V08V61LsFBQ2Pvvt2YnXqAkeQQ5PzgX0e8hOQQmH73X/f2fKERbXM8jotlfMLz17Vq8GMISXzdyshWmv+ovXwTATrQFjB6s8xq2Xwyni1fbg81+StPY5aw7n45DgQFhDx7ar6g3YuAWD4bv8+xDawma+fZ+lfTIqKTryb7cCNPm6cGdW6a00JhZcO0BQ20kHHKruYKq6QZNqQkr8Q0XEVBGYZquqodC83k4abx/TONEgf+KHtYzDuoaYTn8QNeSnxED2LgMitR8vFZtYNr0bc6h+hBNQD+4/DJC+IQx9bW2Cja5E3UmRaJT0M+oBSf2WZmywZHTl54FarvMvqkSklbD+NKZxbL821ReoJZnYlTjDxhF8aBP8dvBcPNS9OJwhSFrlL34iA=
-  file:
-  - release/secure-operator_linux-amd64
-  - release/secure-operator_linux-386
-  - release/secure-operator_linux-arm
-  - release/secure-operator_macos-amd64
-  - release/secure-operator_macos-386
-  - release/secure-operator_windows-amd64.exe
-  - release/secure-operator_windows-386.exe
-  skip_cleanup: true
-  on:
-    repo: fardog/secureoperator
-    tags: true
-    go: "1.10"
+- make release
+

Dockerfile

@@ -1,13 +1,30 @@
-FROM golang:alpine
+FROM golang:1.14.4-alpine3.12 AS builder
 
-EXPOSE 53
+RUN apk --no-cache add make
+RUN mkdir -p /go/src/github.com/tinkernels/doh-proxy
+COPY . /go/src/github.com/tinkernels/doh-proxy
 
-RUN apk --no-cache add ca-certificates && update-ca-certificates
+WORKDIR /go/src/github.com/tinkernels/doh-proxy/v5/
+RUN make linux-amd64
 
-RUN mkdir -p /go/src/github.com/fardog/secureoperator
-COPY . /go/src/github.com/fardog/secureoperator
+FROM alpine:3.12.0 as final
+EXPOSE 53 53/udp
+RUN apk --no-cache add ca-certificates libcap && update-ca-certificates
 
-WORKDIR /go/src/github.com/fardog/secureoperator/cmd/secure-operator
-RUN go install -v
+COPY --from=builder /go/src/github.com/tinkernels/doh-proxy/v5/release/doh-proxy_linux-amd64 /doh
 
-ENTRYPOINT ["secure-operator", "--listen", "0.0.0.0:53"]
+#https://jessicadeen.com/how-to-solve-the-listen-tcp-80-bind-permission-denied-error-in-docker/
+RUN setcap 'cap_net_bind_service=+ep' /doh
+
+RUN addgroup -g 1000 doh
+RUN adduser -D -u 1000 -G doh -g 'doh' doh
+
+USER 1000:1000
+
+ENTRYPOINT ["/doh"]
+CMD ["-google", "-http2", "-endpoint", "https://dns.google/resolve", "-endpoint-ips", "8.8.8.8,8.8.4.4", "-edns-subnet", "auto", "-listen", "127.0.0.1:53", "-no-ipv6", "-cache=true", "-loglevel", "info"]
+
+#HOW TO RUN:
+#docker run -p 53:53 --name doh -d doh:latest
+#https://github.com/pi-hole/docker-pi-hole#note-on-capabilities
+#docker run -p 53:53 --name doh --cap-add=NET_ADMIN --cap-add=CAP_NET_BIND_SERVICE --cap-add=NET_RAW -d doh:latest