diff options
| author |  Joe Gregorio <jcgregorio@google.com> | 2018-05-15 22:07:23 -0400 |
|---|---|---|
| committer |  Skia Commit-Bot <skia-commit-bot@chromium.org> | 2018-05-16 13:32:54 +0000 |
| commit | 5702d8cbca0b8c73a5eff959ed817723d4010bc3 (patch) | |
| tree | 17a73c6fac3cd409cb155d9c1618333436610f4f | |
| parent | f3a21d0540819d22ad5449721144987f51bbca91 (diff) | |
[docker] Move to testing-slim as the base image.
Also clean out more unneeded packages.
Bug: skia:
Change-Id: Iae642c8878e6d65cda0862e92a881b54634f8f30
Reviewed-on: https://skia-review.googlesource.com/128409
Reviewed-by: Mike Klein <mtklein@google.com>
Commit-Queue: Joe Gregorio <jcgregorio@google.com>
| -rw-r--r-- | docker/skiaserve/Dockerfile | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/docker/skiaserve/Dockerfile b/docker/skiaserve/Dockerfile index 4d31b3f8f2..d7188fee4e 100644 --- a/docker/skiaserve/Dockerfile +++ b/docker/skiaserve/Dockerfile @@ -24,10 +24,8 @@ RUN apt-get update && apt-get install -y \ curl \ build-essential \ libfontconfig-dev \ - libfreetype6-dev \ libgl1-mesa-dev \ libglu1-mesa-dev \ - lsb-release \ && cd /tmp \ && git clone 'https://chromium.googlesource.com/chromium/tools/depot_tools.git' \ && export PATH="${PWD}/depot_tools:${PATH}" \ @@ -41,13 +39,13 @@ RUN apt-get update && apt-get install -y \ && gn gen out/Static \ && ninja -C out/Static -FROM launcher.gcr.io/google/debian9 +FROM debian:testing-slim ADD https://storage.googleapis.com/swiftshader-binaries/OpenGL_ES/Latest/Linux/libGLESv2.so /usr/local/lib/libGLESv2.so ADD https://storage.googleapis.com/swiftshader-binaries/OpenGL_ES/Latest/Linux/libEGL.so /usr/local/lib/libEGL.so -RUN apt-get update && apt-get install -y \ - libfontconfig \ +RUN apt-get update && apt-get upgrade -y && apt-get install -y \ + libfontconfig1 \ libglu1-mesa \ xvfb \ && rm -rf /var/lib/apt/lists/* COPY --from=build /tmp/skia/skia/out/Static/skiaserve /bin/skiaserve -ENTRYPOINT DISPLAY=:99 /usr/bin/xvfb-run --server-args "-screen 0 1280x1024x24" /bin/skiaserve --address 0.0.0.0 +ENTRYPOINT DISPLAY=:99 /usr/bin/xvfb-run --server-args "-screen 0 1280x1024x24" /bin/skiaserve --address 0.0.0.0 --port 8000 |