diff options
| author | Runar Borge <runar@borge.nu> | 2019-07-22 21:54:20 +0200 |
|---|---|---|
| committer | Runar Borge <runar@borge.nu> | 2019-07-22 21:54:20 +0200 |
| commit | 6056acfa06c2b79ee8981b9f36a1ced2dac29111 (patch) | |
| tree | 613944f1de089105950a86501507b6aa2151380d /docker/Dockerfile | |
| parent | b229f0bd958a42c6faa345c91500c2ed8ccdc919 (diff) | |
| parent | 8c22ceead487b745d6b7c058c4d1c0a0eaa051c8 (diff) | |
| download | vyos-build-6056acfa06c2b79ee8981b9f36a1ced2dac29111.tar.gz vyos-build-6056acfa06c2b79ee8981b9f36a1ced2dac29111.zip | |
Merge remote-tracking branch 'origin/current' into equuleus
fixed merge errors in:
* scripts/live-build-config
- kernel parameters
* scripts/build-packages
- fixed list of packages to compile
Diffstat (limited to 'docker/Dockerfile')
| -rw-r--r-- | docker/Dockerfile | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/docker/Dockerfile b/docker/Dockerfile index 69c76ddb..041a9260 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -129,9 +129,12 @@ RUN apt-get update && apt-get install -y \ # Packages needed for vyatta-iproute RUN apt-get update && apt-get install -y \ + iptables-dev \ libatm1-dev \ + libcap-dev \ libdb-dev \ - iptables-dev + libelf-dev \ + libselinux1-dev # Packages needed for vyatta-webgui RUN apt-get update && apt-get install -y \ @@ -309,6 +312,5 @@ RUN echo "$(opam env --root=/opt/opam --set-root)" >> /etc/skel/.bashrc # Cleanup RUN rm -rf /tmp/* -COPY pkg-build.sh /usr/local/bin/pkg-build.sh COPY entrypoint.sh /usr/local/bin/entrypoint.sh ENTRYPOINT ["/usr/local/bin/entrypoint.sh"] |