diff options
| author | Devin Jeanpierre <jeanpierreda@gmail.com> | 2017-05-01 23:31:02 -0700 |
|---|---|---|
| committer | Kostya Serebryany <konstantin.s.serebryany@gmail.com> | 2017-05-01 23:31:02 -0700 |
| commit | 330386686d6e7b84e9fd927083d3d9cf681835b1 (patch) | |
| tree | 04274d779612e66be7ecc51765b20a3ec96d0cf6 /projects/libreoffice | |
| parent | d5ac427bf877a68062f226f34f9258901153a494 (diff) | |
| download | oss-fuzz-330386686d6e7b84e9fd927083d3d9cf681835b1.tar.gz | |
Use apt-get update && apt-get install, per best practices: (#561)
https://docs.docker.com/engine/userguide/eng-image/dockerfile_best-practices/
I ran into this because I was getting errors locally, like:
E: Failed to fetch http://archive.ubuntu.com/ubuntu/pool/main/d/dpkg/libdpkg-perl_1.18.4ubuntu1.1_all.deb 404 Not Found [IP: 91.189.88.149 80]
It turns out you get these if you don't update, and the official best practices are to `run apt-get update && apt-get install`. In fact, running _any_ apt-get install command without the apt-get update && before it can result in unfortunate caching artifacts -- see "cache busting". (P.S. thanks to Peng on Freenode for helping me, I'm bad at Ubuntu.)
So:
sed -re \
's/RUN apt-get ((-y )?(install|build-dep))/RUN apt-get update \&\& apt-get \1/' -i \
projects/**/Dockerfile
I also manually fixed the cases that already ran apt-get update in their Dockerfile:
dlplibs/Dockerfile
grpc/Dockerfile
libreoffice/Dockerfile
Diffstat (limited to 'projects/libreoffice')
| -rw-r--r-- | projects/libreoffice/Dockerfile | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/projects/libreoffice/Dockerfile b/projects/libreoffice/Dockerfile index cd7784149..bcb9912dc 100644 --- a/projects/libreoffice/Dockerfile +++ b/projects/libreoffice/Dockerfile @@ -19,9 +19,8 @@ MAINTAINER officesecurity@lists.freedesktop.org # enable source repos RUN sed -i -e '/^#\s*deb-src.*\smain\s\+restricted/s/^#//' /etc/apt/sources.list #build requirements -RUN apt-get update -RUN apt-get build-dep -y libreoffice -RUN apt-get install -y wget yasm +RUN apt-get update && apt-get build-dep -y libreoffice +RUN apt-get update && apt-get install -y wget yasm #cache build dependencies ADD https://dev-www.libreoffice.org/src/c3c1a8ba7452950636e871d25020ce0d-pt-serif-font-1.0000W.tar.gz \ https://dev-www.libreoffice.org/src/c74b7223abe75949b4af367942d96c7a-crosextrafonts-carlito-20130920.tar.gz \ |