Merge pull request #4 from xtr0py/testing

Update docker-publish.yml

Author: xtr0py

.github/workflows/docker-publish.yml

@@ -26,7 +26,7 @@ jobs:
         uses: actions/checkout@v2
 
       - name: Setup default version
-        run: echo "DNSCRYPT_PROXY_VERSION=2.0.45" >> $GITHUB_ENV
+        run: echo "DNSCRYPT_PROXY_VERSION=2.1.1" >> $GITHUB_ENV
         if: ${{ env.DNSCRYPT_PROXY_VERSION == '' }}
 
       - name: Setup Docker buildx
@@ -50,5 +50,5 @@ jobs:
           context: .
           platforms: linux/amd64
           build-args: VERSION=${{ env.DNSCRYPT_PROXY_VERSION }} 
-          tags: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:latest,${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:${{ env.DNSCRYPT_PROXY_VERSION }}
+          tags: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:testing,${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:${{ env.DNSCRYPT_PROXY_VERSION }}
           push: true

Dockerfile

@@ -1,5 +1,5 @@
 FROM golang:alpine as build
-ENV RELEASE_TAG 2.0.45
+ENV RELEASE_TAG 2.1.1
 RUN apk --no-cache add git && \
     git clone https://github.com/jedisct1/dnscrypt-proxy /go/src/github.com/jedisct1/ && \
     cd /go/src/github.com/jedisct1/dnscrypt-proxy && \

README.md

@@ -1,22 +1,25 @@
-[![Docker Cloud Build Status](https://img.shields.io/docker/cloud/build/xtr0py/dnscrypt-proxy-2-docker.svg)](https://hub.docker.com/r/xtr0py/dnscrypt-proxy-2-docker)
+[![Build](https://github.com/xtr0py/dnscrypt-proxy-2-docker/actions/workflows/docker-publish.yml/badge.svg?branch=testing)](https://github.com/xtr0py/dnscrypt-proxy-2-docker/actions/workflows/docker-publish.yml)
 ![Docker Image Size (latest by date)](https://img.shields.io/docker/image-size/xtr0py/dnscrypt-proxy-2-docker)
 [![Docker Pulls](https://img.shields.io/docker/pulls/xtr0py/dnscrypt-proxy-2-docker.svg)](https://hub.docker.com/r/xtr0py/dnscrypt-proxy-2-docker)
 
 This is a Docker image containing [DNSCrypt Proxy 2.x](https://github.com/jedisct1/dnscrypt-proxy). You can use this to set up a DNS proxy on your local network which resolves queries using DNSCrypt or DNS-over-HTTPS (DoH) rather than sending plaintext DNS queries over the Internet.
 
 This image comes with a configuration which:
+- [x] updated DNScrypt-proxy 2.1.1 
 - [x] Looks up queries via DNS-over-HTTPS (DoH) and DNSCrypt
 - [x] Use only DNSSEC, no logging, no filtering servers
 - [x] Listens on all interfaces
 - [x] Excludes Cloudflare, Google, and Yandex servers
-- [x] updated DNScrypt-proxy 2.0.45 
 - [x] Uses public-resolvers v3
+- [x] "unstable" branch removed will use "testing" for future development 
+
 
 
 You can run with this configuration:
 
 `docker run -p 53:53/udp xtr0py/dnscrypt-proxy-2-docker`
 
+
 If you wish to override the configuration:
 
 `docker run -p 53:53/udp  -v /path/to/dnscrypt-proxy.toml:/config/dnscrypt-proxy.toml xtr0py/dnscrypt-proxy-2-docker`

config/dnscrypt-proxy.toml

@@ -71,7 +71,7 @@ force_tcp = false
 
 ## How long a DNS query will wait for a response, in milliseconds
 
-timeout = 2500
+timeout = 5000
 
 
 ## Load-balancing strategy: 'p2' (default), 'ph', 'fastest' or 'random'
@@ -110,7 +110,7 @@ cert_refresh_delay = 240
 ## It will not be used if the configured system DNS works.
 ## A resolver supporting DNSSEC is recommended. This may become mandatory.
 
-fallback_resolver = '9.9.9.9:53'
+bootstrap_resolvers = ['9.9.9.9:53', '1.1.1.1:53']
 
 
 ## Never try to use the system DNS settings; unconditionally use the
@@ -202,7 +202,7 @@ block_ipv6 = true
 
 ## Enable a DNS cache to reduce latency and outgoing traffic
 
-cache = true
+cache = false
 
 
 ## Cache size
@@ -283,30 +283,30 @@ cache_neg_ttl = 60
 ##   ads*.example.*
 ##   ads*.example[0-9]*.com
 ##
-## Example blacklist files can be found at https://download.dnscrypt.info/blacklists/
-## A script to build blacklists from public feeds can be found in the
-## `utils/generate-domains-blacklists` directory of the dnscrypt-proxy source code.
+## Example blacklist files can be found at https://download.dnscrypt.info/blocklists/
+## A script to build blocklist from public feeds can be found in the
+## `utils/generate-domains-blocklists` directory of the dnscrypt-proxy source code.
 
-[blacklist]
+[blocked_names]
 
-  ## Path to the file of blocking rules (absolute, or relative to the same directory as the executable file)
+## Path to the file of blocking rules (absolute, or relative to the same directory as the config file)
 
-  # blacklist_file = 'blacklist.txt'
+# blocked_names_file = 'blocked-names.txt'
 
 
-  ## Optional path to a file logging blocked queries
+## Optional path to a file logging blocked queries
 
-  # log_file = 'blocked.log'
+# log_file = 'blocked.log'
 
 
-  ## Optional log format: tsv or ltsv (default: tsv)
+## Optional log format: tsv or ltsv (default: tsv)
 
-  # log_format = 'tsv'
+# log_format = 'tsv'
 
 
 
 ###########################################################
-#        Pattern-based IP blocking (IP blacklists)        #
+#        Pattern-based IP blocking (IP blocklists)        #
 ###########################################################
 
 ## IP blacklists are made of one pattern per line. Example of valid patterns:
@@ -315,16 +315,16 @@ cache_neg_ttl = 60
 ##   fe80:abcd:*
 ##   192.168.1.4
 
-[ip_blacklist]
+[blocked_ips]
 
-  ## Path to the file of blocking rules (absolute, or relative to the same directory as the executable file)
+## Path to the file of blocking rules (absolute, or relative to the same directory as the config file)
 
-  # blacklist_file = 'ip-blacklist.txt'
+# blocked_ips_file = 'blocked-ips.txt'
 
 
-  ## Optional path to a file logging blocked queries
+## Optional path to a file logging blocked queries
 
-  # log_file = 'ip-blocked.log'
+# log_file = 'blocked-ips.log'
 
 
   ## Optional log format: tsv or ltsv (default: tsv)