diff options
| author | Linus Nordberg <linus@nordu.net> | 2017-02-01 10:56:49 +0100 |
|---|---|---|
| committer | Linus Nordberg <linus@nordu.net> | 2017-02-01 10:56:49 +0100 |
| commit | d46486796f693b9630caaeee20d0386fc9f635ba (patch) | |
| tree | 665a5e403f147b273fca6547660a34256a3049e7 | |
| parent | c222c8fb3be498c683625b87c5d9d7597e9a57b1 (diff) | |
| parent | 4735f280c8ccb3dc4c2e48f5cd6432d8b8e8c51d (diff) | |
Merge remote-tracking branch 'refs/remotes/map/permdb'
Conflicts:
catlfish-dev/Dockerfile
| -rw-r--r-- | catlfish-dev/Dockerfile | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/catlfish-dev/Dockerfile b/catlfish-dev/Dockerfile index 7d9efb1..c395a36 100644 --- a/catlfish-dev/Dockerfile +++ b/catlfish-dev/Dockerfile @@ -29,7 +29,7 @@ RUN echo 'debconf debconf/frontend select noninteractive' | debconf-set-selectio RUN apt-get -y -q install gcc git make curl g++ libssl-dev nettle-dev libbsd-dev librhash-dev libpython2.7-dev # For merge and tests. -RUN apt-get -y -q install git python-ecdsa python-yaml python-pyasn1 unzip +RUN apt-get -y -q install git python-ecdsa python-yaml python-pyasn1 unzip nettle-dev libbsd-dev librhash-dev # Build all dependencies. |