daxi20/smartdns
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

docker: make dockerfile build from local source

Browse Source
This commit is contained in:
Nick Peng
2022-06-12 00:51:19 +08:00
parent d185b78836
commit c0f4c72626
2 changed files with 14 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
Dockerfile
View File

@@ -1,18 +1,17 @@
FROM debian:buster-slim FROM ubuntu:latest as smartdns-builder
COPY . /smartdns/
RUN apt update && \ RUN apt update && \
apt install -y git make gcc libssl-dev && \ apt install -y make gcc libssl-dev && \
git clone https://github.com/pymumu/smartdns.git --depth 1 && \
cd smartdns && \ cd smartdns && \
sh ./package/build-pkg.sh --platform debian --arch `dpkg --print-architecture` && \ sh ./package/build-pkg.sh --platform debian --arch `dpkg --print-architecture`
dpkg -i package/*.deb && \
cd / && \ FROM ubuntu:latest
rm -rf smartdns/ && \ COPY --from=smartdns-builder /smartdns/package/*.deb /opt/
apt autoremove -y git make gcc libssl-dev && \ RUN dpkg -i /opt/*.deb && \
apt clean && \ rm /opt/*deb -fr
rm -rf /var/lib/apt/lists/*
EXPOSE 53/udp EXPOSE 53/udp
VOLUME "/etc/smartdns/" VOLUME "/etc/smartdns/"
CMD ["/usr/sbin/smartdns", "-f"] CMD ["/usr/sbin/smartdns", "-f", "-x"]

2
src/dns_conf.c
View File

@@ -1458,7 +1458,7 @@ static struct dns_ptr *_dns_conf_get_ptr(const char *ptr_domain)
key = hash_string(ptr_domain); key = hash_string(ptr_domain);
hash_for_each_possible(dns_ptr_table.ptr, ptr, node, key) hash_for_each_possible(dns_ptr_table.ptr, ptr, node, key)
{ {
if (strncmp(ptr->ptr_domain, ptr_domain, DNS_MAX_CNAME_LEN) != 0) { if (strncmp(ptr->ptr_domain, ptr_domain, DNS_MAX_PTR_LEN) != 0) {
continue; continue;
} }