Revert "Another attempt to fix vpython in Cloud Build."
This reverts commit e7bc0844989faff96aa22ae052cc8603d6f8c6b9.
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>
diff --git a/docker/skia-release/Dockerfile b/docker/skia-release/Dockerfile
index d8670b4..952e959 100644
--- a/docker/skia-release/Dockerfile
+++ b/docker/skia-release/Dockerfile
@@ -11,6 +11,8 @@
&& 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 @@
&& ./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.
#
