This is an automated email from the ASF dual-hosted git repository.
philo pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/incubator-gluten.git
The following commit(s) were added to refs/heads/main by this push:
new 1451a79db [GLUTEN-7033][VL] Improve vcpkg docker file (#7030)
1451a79db is described below
commit 1451a79db8ace6f98955e3bbd2aae7f6250c78b5
Author: Zhen Wang <[email protected]>
AuthorDate: Wed Aug 28 15:44:03 2024 +0800
[GLUTEN-7033][VL] Improve vcpkg docker file (#7030)
---
dev/vcpkg/docker/Dockerfile | 14 +++++++-------
1 file changed, 7 insertions(+), 7 deletions(-)
diff --git a/dev/vcpkg/docker/Dockerfile b/dev/vcpkg/docker/Dockerfile
index e1c8a7313..7332bbf45 100644
--- a/dev/vcpkg/docker/Dockerfile
+++ b/dev/vcpkg/docker/Dockerfile
@@ -1,10 +1,6 @@
FROM centos:7
-RUN sed -e 's|^mirrorlist=|#mirrorlist=|g' \
- -e
's|^#baseurl=http://mirror.centos.org/centos|baseurl=http://mirrors.edge.kernel.org/centos/|g'
\
- -i.bak \
- /etc/yum.repos.d/CentOS-Base.repo
-RUN sed -i "s/enabled=1/enabled=0/" /etc/yum/pluginconf.d/fastestmirror.conf
+RUN sed -i "s/enabled=1/enabled=0/" /etc/yum/pluginconf.d/fastestmirror.conf
WORKDIR /tmp/vcpkg
COPY setup-build-depends.sh setup-build-depends.sh
@@ -15,8 +11,12 @@ RUN rm -rf /tmp/vcpkg
ARG BUILDER_UID
ARG BUILDER_GID
-RUN groupadd -g ${BUILDER_GID} build
-RUN useradd -mu ${BUILDER_UID} -g build -G wheel build
+RUN if ["$BUILDER_GID" != "0"]; then \
+ groupadd -g ${BUILDER_GID} build; \
+ fi
+RUN if ["$BUILDER_UID" != "0"]; then \
+ useradd -mu ${BUILDER_UID} -g ${BUILDER_GID} -G wheel build; \
+ fi
USER ${BUILDER_UID}:${BUILDER_GID}
ENV VCPKG_BINARY_SOURCES=default
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
