AuroraMiddleware/skia2
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Revert "Another attempt to fix vpython in Cloud Build."

Browse Source 
This reverts commit e7bc084498.

Reason for revert: Broke fiddle.

Original change's description:
> Another attempt to fix vpython in Cloud Build.
> 
> I think the underlying issue is switching to the 'skia' user
> to do the build. Instead let's try building as root and then
> chown the generated files which are then used by subsequent
> Dockerfiles.
> 
> Bug:993053
> Change-Id: I314a6c83f70e611ec0fafe93ae136d218d153cfb
> Reviewed-on: https://skia-review.googlesource.com/c/skia/+/247107
> Reviewed-by: Joe Gregorio <jcgregorio@google.com>
> Commit-Queue: Joe Gregorio <jcgregorio@google.com>

TBR=borenet@google.com,jcgregorio@google.com

Change-Id: I2e0968bc032a2c7716d95d51ba598d94fc67f1ca
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Bug: 993053
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/247143
Reviewed-by: Joe Gregorio <jcgregorio@google.com>
Commit-Queue: Joe Gregorio <jcgregorio@google.com>
This commit is contained in:
Joe Gregorio 2019-10-08 22:44:13 +00:00 committed by Skia Commit-Bot
parent 7327c9ddfc
commit df2726ee7a
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
docker/skia-release/Dockerfile
View File

@ -11,6 +11,8 @@ RUN apt-get update && apt-get upgrade -y && apt-get install -y \
&& groupadd -g 2000 skia \
&& useradd -u 2000 -g 2000 --home-dir /workspace/__cache skia
USER skia
ADD --chown=skia:skia https://storage.googleapis.com/swiftshader-binaries/OpenGL_ES/Latest/Linux/libGLESv2.so /usr/local/lib/libGLESv2.so
ADD --chown=skia:skia https://storage.googleapis.com/swiftshader-binaries/OpenGL_ES/Latest/Linux/libEGL.so /usr/local/lib/libEGL.so
RUN cd /tmp \
@ -44,8 +46,7 @@ RUN cd /tmp/skia/skia \
&& ./bin/fetch-gn \
&& ./bin/gn gen out/Static \
&& git rev-parse HEAD > VERSION \
&& /tmp/depot_tools/ninja -C out/Static \
&& chown -R skia:skia out/Static
&& /tmp/depot_tools/ninja -C out/Static
# Uncomment the lines below and update the ref to patch in a CL.
#