docker: build with manager using apkg

diff --git a/Dockerfile b/Dockerfile
index c82938fdaa04d94ce5462615a5bd31fcc21b4cfd..cbe2263be27312747e13e656a8ce48921c315d4d 100644 (file)
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,78 +1,61 @@
-# Intermediate container for Knot DNS build (not persistent)
 # SPDX-License-Identifier: GPL-3.0-or-later
-FROM debian:11 AS knot-dns-build
-ARG KNOT_DNS_VERSION=v3.1.1
-
-# Build dependencies
-ENV KNOT_DNS_BUILD_DEPS git-core build-essential libtool autoconf pkg-config \
-       libgnutls28-dev libprotobuf-dev libprotobuf-c-dev libfstrm-dev
-ENV KNOT_RESOLVER_BUILD_DEPS build-essential pkg-config bsdmainutils liblmdb-dev \
-       libluajit-5.1-dev libuv1-dev libprotobuf-dev libprotobuf-c-dev \
-       libfstrm-dev luajit lua-http libssl-dev libnghttp2-dev protobuf-c-compiler \
-       meson
-ENV BUILDENV_DEPS ${KNOT_DNS_BUILD_DEPS} ${KNOT_RESOLVER_BUILD_DEPS}
-RUN apt-get update -qq && \
-       apt-get -y -qqq install ${BUILDENV_DEPS}
-
-# Install Knot DNS from sources
-RUN git clone -b $KNOT_DNS_VERSION --depth=1 https://gitlab.nic.cz/knot/knot-dns.git /tmp/knot-dns && \
-       cd /tmp/knot-dns && \
-       autoreconf -if && \
-       ./configure --disable-static --disable-fastparser --disable-documentation \
-               --disable-daemon --disable-utilities --with-lmdb=no && \
-       make -j4 install && \
-       ldconfig
 
-# Copy libknot, libdnssec, libzscanner to runtime
-RUN mkdir -p /tmp/root/usr/local/include /tmp/root/usr/local/lib /tmp/root/usr/local/lib/pkgconfig && \
-       cp -rt /tmp/root/usr/local/include /usr/local/include/libknot /usr/local/include/libdnssec /usr/local/include/libzscanner && \
-       cp -rt /tmp/root/usr/local/lib /usr/local/lib/libknot* /usr/local/lib/libdnssec* /usr/local/lib/libzscanner* && \
-       cp -rt /tmp/root/usr/local/lib/pkgconfig /usr/local/lib/pkgconfig/libknot.pc /usr/local/lib/pkgconfig/libdnssec.pc /usr/local/lib/pkgconfig/libzscanner.pc
+# Intermediate container for build
+FROM debian:11 AS build
 
+ENV OBS_REPO=knot-resolver-latest
+ENV DISTROTEST_REPO=Debian_11
 
-# Intermediate container with runtime dependencies
-FROM debian:11-slim AS runtime
 
-# Install runtime dependencies
-ENV KNOT_DNS_RUNTIME_DEPS libgnutls30
-ENV KNOT_RESOLVER_RUNTIME_DEPS liblmdb0 luajit libluajit-5.1-2 libuv1 lua-http libnghttp2-14
-ENV KNOT_RESOLVER_RUNTIME_DEPS_HTTP lua-http lua-mmdb
-ENV KNOT_RESOLVER_RUNTIME_DEPS_EXTRA lua-cqueues
-ENV KNOT_RESOLVER_RUNTIME_DEPS_DNSTAP libfstrm0 libprotobuf-c1
-ENV KNOT_RESOLVER_RUNTIME_DEPS_SSL ca-certificates
-ENV RUNTIME_DEPS ${KNOT_DNS_RUNTIME_DEPS} ${KNOT_RESOLVER_RUNTIME_DEPS} \
-    ${KNOT_RESOLVER_RUNTIME_DEPS_HTTP} ${KNOT_RESOLVER_RUNTIME_DEPS_EXTRA} \
-    ${KNOT_RESOLVER_RUNTIME_DEPS_SSL} ${KNOT_RESOLVER_RUNTIME_DEPS_DNSTAP}
 RUN apt-get update -qq && \
-       apt-get install -y -qqq ${RUNTIME_DEPS} && \
-       apt-get clean && \
-       rm -rf /var/lib/apt/lists/*
+       apt-get -qqq -y install gnupg2 curl python3-pip python3-venv devscripts && \
+       echo "deb http://download.opensuse.org/repositories/home:/CZ-NIC:/$OBS_REPO/$DISTROTEST_REPO/ /" > /etc/apt/sources.list.d/obs.list && \
+       curl -fsSL "https://download.opensuse.org/repositories/home:CZ-NIC:$OBS_REPO/$DISTROTEST_REPO/Release.key" | gpg --dearmor > /etc/apt/trusted.gpg.d/obs.gpg && \
+       apt-get update -qq && \
+       pip3 install pipx && \
+       pipx install apkg
+
+COPY . /source
 
+RUN cd /source && \
+       export PATH="$PATH:/root/.local/bin" && \
+       git submodule update --init --recursive && \
+       git config --global user.name "Docker Build" && \
+       git config --global user.email docker-build@knot-resolver && \
+       /root/.local/bin/apkg build-dep -y && \
+       /root/.local/bin/apkg build
 
-# Intermediate container for Knot Resolver build
-FROM knot-dns-build AS build
 
-# Get Knot Resolver code from current directory
-COPY . /tmp/knot-resolver
+# Real container
+FROM debian:11-slim AS runtime
 
-# Build Knot Resolver
-RUN cd /tmp/knot-resolver && \
-       meson build_docker --buildtype=plain --prefix=/usr --libdir=lib -Dc_args="-O2 -fstack-protector -g" && \
-       DESTDIR=/tmp/root ninja -C build_docker install && \
-       cp /tmp/root/usr/share/doc/knot-resolver/examples/config.docker /tmp/root/etc/knot-resolver/kresd.conf
+ENV OBS_REPO=knot-resolver-latest
+ENV DISTROTEST_REPO=Debian_11
 
+RUN apt-get update -qq && \
+       apt-get -qqq -y install gnupg2 curl && \
+       echo "deb http://download.opensuse.org/repositories/home:/CZ-NIC:/$OBS_REPO/$DISTROTEST_REPO/ /" > /etc/apt/sources.list.d/obs.list && \
+       curl -fsSL "https://download.opensuse.org/repositories/home:CZ-NIC:$OBS_REPO/$DISTROTEST_REPO/Release.key" | gpg --dearmor > /etc/apt/trusted.gpg.d/obs.gpg && \
+       apt-get update -qq
+
+COPY --from=build /source/pkg/pkgs/debian-11 /pkg
+
+# install resolver, minimize image and prepare config directory
+RUN apt-get install -y /pkg/*/*.deb && \
+       rm -r /pkg && \
+       apt-get remove -y -qq curl gnupg2 && \
+       apt-get autoremove -y && \
+       apt-get clean && \
+       rm -rf /var/lib/apt/lists/* && \
+       mkdir /config
+
+COPY manager/etc/knot-resolver/config.yml /config/config.yml
 
-# Final container
-FROM runtime
 LABEL cz.knot-resolver.vendor="CZ.NIC"
 LABEL maintainer="knot-resolver-users@lists.nic.cz"
 
 # Export DNS over UDP & TCP, DNS-over-HTTPS, DNS-over-TLS, web interface
 EXPOSE 53/UDP 53/TCP 443/TCP 853/TCP 8453/TCP
 
-# Fetch Knot Resolver + Knot DNS libraries from build image
-COPY --from=build /tmp/root/ /
-RUN ldconfig
-
-ENTRYPOINT ["/usr/sbin/kresd"]
-CMD ["-c", "/etc/knot-resolver/kresd.conf"]
+ENTRYPOINT ["/usr/bin/python3", "-m", "knot_resolver_manager"]
+CMD ["-c", "/config/config.yml"]