Commit 0705a925 authored by Daniel Salzman's avatar Daniel Salzman

docker: add libmaxminddb, upgrade libidn, cleanup

parent fceaabb8
...@@ -14,6 +14,7 @@ RUN yum -y install \ ...@@ -14,6 +14,7 @@ RUN yum -y install \
'pkgconfig(libedit)' \ 'pkgconfig(libedit)' \
'pkgconfig(libfstrm)' \ 'pkgconfig(libfstrm)' \
'pkgconfig(libidn2)' \ 'pkgconfig(libidn2)' \
'pkgconfig(libmaxminddb)' \
'pkgconfig(libprotobuf-c)' \ 'pkgconfig(libprotobuf-c)' \
'pkgconfig(libsystemd)' \ 'pkgconfig(libsystemd)' \
'pkgconfig(liburcu)' \ 'pkgconfig(liburcu)' \
......
...@@ -9,7 +9,6 @@ RUN apt-get -y install \ ...@@ -9,7 +9,6 @@ RUN apt-get -y install \
autoconf \ autoconf \
automake \ automake \
autotools-dev \ autotools-dev \
bash-completion \
build-essential \ build-essential \
curl \ curl \
ghostscript \ ghostscript \
...@@ -17,8 +16,9 @@ RUN apt-get -y install \ ...@@ -17,8 +16,9 @@ RUN apt-get -y install \
libedit-dev \ libedit-dev \
libfstrm-dev \ libfstrm-dev \
libgnutls28-dev \ libgnutls28-dev \
libidn11-dev \ libidn2-0-dev \
liblmdb-dev \ liblmdb-dev \
libmaxminddb-dev \
libprotobuf-c-dev \ libprotobuf-c-dev \
libsystemd-dev \ libsystemd-dev \
libtool \ libtool \
...@@ -26,7 +26,7 @@ RUN apt-get -y install \ ...@@ -26,7 +26,7 @@ RUN apt-get -y install \
locales-all \ locales-all \
osc \ osc \
pkg-config \ pkg-config \
protobuf-c-compiler \ protobuf-c-compiler \
python-sphinx \ python-sphinx \
texinfo texlive \ texinfo texlive \
texlive-font-utils \ texlive-font-utils \
......
...@@ -9,7 +9,6 @@ RUN apt-get -y install \ ...@@ -9,7 +9,6 @@ RUN apt-get -y install \
autoconf \ autoconf \
automake \ automake \
autotools-dev \ autotools-dev \
bash-completion \
build-essential \ build-essential \
clang-6.0 \ clang-6.0 \
curl \ curl \
...@@ -18,15 +17,16 @@ RUN apt-get -y install \ ...@@ -18,15 +17,16 @@ RUN apt-get -y install \
libedit-dev \ libedit-dev \
libfstrm-dev \ libfstrm-dev \
libgnutls28-dev \ libgnutls28-dev \
libidn11-dev \ libidn2-0-dev \
liblmdb-dev \ liblmdb-dev \
libmaxminddb-dev \
libprotobuf-c-dev \ libprotobuf-c-dev \
libsystemd-dev \ libsystemd-dev \
libtool \ libtool \
liburcu-dev \ liburcu-dev \
locales-all \ locales-all \
pkg-config \ pkg-config \
protobuf-c-compiler \ protobuf-c-compiler \
python-sphinx \ python-sphinx \
texinfo texlive \ texinfo texlive \
texlive-font-utils \ texlive-font-utils \
......
...@@ -3,17 +3,18 @@ MAINTAINER Knot DNS <knot-dns@labs.nic.cz> ...@@ -3,17 +3,18 @@ MAINTAINER Knot DNS <knot-dns@labs.nic.cz>
ENV DEBIAN_FRONTEND noninteractive ENV DEBIAN_FRONTEND noninteractive
RUN dnf -y upgrade RUN dnf -y upgrade
RUN dnf -y install \ RUN dnf -y install \
'make' \
'autoconf' \ 'autoconf' \
'automake' \ 'automake' \
'libtool' \ 'libtool' \
'lmdb-devel' \ 'lmdb-devel' \
'make' \
'pkgconfig' \ 'pkgconfig' \
'pkgconfig(gnutls)' \ 'pkgconfig(gnutls)' \
'pkgconfig(libcap-ng)' \ 'pkgconfig(libcap-ng)' \
'pkgconfig(libedit)' \ 'pkgconfig(libedit)' \
'pkgconfig(libfstrm)' \ 'pkgconfig(libfstrm)' \
'pkgconfig(libidn2)' \ 'pkgconfig(libidn2)' \
'pkgconfig(libmaxminddb)' \
'pkgconfig(libprotobuf-c)' \ 'pkgconfig(libprotobuf-c)' \
'pkgconfig(libsystemd)' \ 'pkgconfig(libsystemd)' \
'pkgconfig(liburcu)' \ 'pkgconfig(liburcu)' \
......
...@@ -3,28 +3,28 @@ MAINTAINER Knot DNS <knot-dns@labs.nic.cz> ...@@ -3,28 +3,28 @@ MAINTAINER Knot DNS <knot-dns@labs.nic.cz>
ENV DEBIAN_FRONTEND noninteractive ENV DEBIAN_FRONTEND noninteractive
RUN apt-get -y update RUN apt-get -y update
RUN apt-get -y dist-upgrade RUN apt-get -y dist-upgrade
RUN apt-get -y install \ RUN apt-get -y install \
autoconf \ autoconf \
automake \ automake \
autotools-dev \ autotools-dev \
bash-completion \ build-essential \
build-essential \ curl \
curl \ ghostscript \
ghostscript \ git \
git \ language-pack-en \
language-pack-en \ libedit-dev \
libedit-dev \ libgnutls28-dev \
libgnutls28-dev \ libidn2-0-dev \
libidn11-dev \ liblmdb-dev \
liblmdb-dev \ libmaxminddb-dev \
libsystemd-dev \ libsystemd-dev \
libtool \ libtool \
liburcu-dev \ liburcu-dev \
pkg-config \ pkg-config \
python-sphinx \ python-sphinx \
texinfo \ texinfo \
texlive \ texlive \
texlive-font-utils \ texlive-font-utils \
texlive-generic-extra \ texlive-generic-extra \
texlive-latex-extra \ texlive-latex-extra \
unzip unzip
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment