diff --git a/Dockerfile b/Dockerfile deleted file mode 100644 index d3cea108e..000000000 --- a/Dockerfile +++ /dev/null @@ -1,10 +0,0 @@ -FROM ubuntu:18.04 - - - -RUN apt-get update \ - && DEBIAN_FRONTEND=noninteractive apt-get install -qqy \ - build-essential nasm autotools-dev autoconf libcurl4-openssl-dev libjemalloc-dev tcl tcl-dev uuid-dev libcurl4-openssl-dev \ - && apt-get clean - -CMD make diff --git a/pkg/deb/README.md b/pkg/deb/README.md index fe8708498..32f39762f 100644 --- a/pkg/deb/README.md +++ b/pkg/deb/README.md @@ -2,6 +2,8 @@ This directory contains scripts and components needed to generate debian packages on different distributions/architectures from source +The 'debian' directory contains debian source code for bionic, buster and later distributions as it uses functions only available with debhelper11+. 'debian_dh9' is used for xenial, stretch and earlier distributions using debhelper9. + You will need to install pbuilder `sudo apt install pbuilder` along with other distribution specific dependancies Generate deb packages with the following script command run from this directory: @@ -10,7 +12,7 @@ Generate deb packages with the following script command run from this directory: $ ./deb-buildsource.sh ``` -This generates a directory structure, .dsc file, original.tar.gz, .changes files and new changelog for the distribution and architecture installed. +This generates a directory structure, .dsc file, original.tar.gz, and new changelog for the distribution and architecture installed. When complete the produced debian packages will be located in deb_files_generated directory. diff --git a/pkg/docker/Dockerfile b/pkg/docker/Dockerfile index e429a6857..dce45ef53 100644 --- a/pkg/docker/Dockerfile +++ b/pkg/docker/Dockerfile @@ -56,7 +56,6 @@ RUN \ ln -s keydb.conf redis.conf # Ensure deps installed for binaries -# libc6 (>= 2.17), libcurl4 (>= 7.16.2), libgcc1 (>= 1:3.0), libstdc++6 (>= 4.8.1), libuuid1 (>= 2.16), libssl1.1 (>= 1.1.1) RUN set -eux; \ \ savedAptMark="$(apt-mark showmanual)"; \ @@ -68,6 +67,10 @@ RUN set -eux; \ libstdc++6 \ libgcc1 \ zlib1g \ + libbz2-1.0 \ + liblz4-1 \ + libsnappy1v5 \ + libzstd1 \ ; \ rm -rf /var/lib/apt/lists/* diff --git a/pkg/rpm/README.md b/pkg/rpm/README.md index daa245359..df50883e4 100644 --- a/pkg/rpm/README.md +++ b/pkg/rpm/README.md @@ -1,6 +1,6 @@ ### Generate RPM files for the generated binaries -After making the binaries you can run the following script +After running make to produce keydb binaries you can run the following script to create rpm package Usage: ```