Run buildenv as github actions user, fix buildifier not installed for…

… all users
krpc · Jul 18, 2024 · 2a1e5d0 · 2a1e5d0
1 parent b326a91
commit 2a1e5d0
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 4 deletions.
diff --git a/tools/buildenv/CHANGES.txt b/tools/buildenv/CHANGES.txt
@@ -1,3 +1,7 @@
+v3.4.3
+ * Run with github actions uid and gid
+ * Fix buildifier not installed for all users
+
 v3.4.2
  * Remove --distinct_host_configuration from bazelrc
 

diff --git a/tools/buildenv/Dockerfile b/tools/buildenv/Dockerfile
@@ -57,11 +57,15 @@ RUN apt-get update && \
     apt-get install -y --no-install-recommends golang && \
     apt-get clean && \
     git clone https://github.com/bazelbuild/buildtools.git --depth 1 --branch v7.1.2 && \
-    (cd buildtools/buildifier; go install)
-ENV PATH="${PATH}:/root/go/bin"
+    (cd buildtools/buildifier; GOBIN=/usr/local/bin go install)
 
 # Configure Bazel
 COPY bazelrc /etc/bazel.bazelrc
 RUN chmod 0644 /etc/bazel.bazelrc
 
 WORKDIR /build
+
+# Add github actions user
+RUN groupadd -g 121 runner
+RUN useradd -mr -d /home/runner -u 1001 -g 121 runner
+RUN usermod -aG sudo runner
diff --git a/tools/buildenv/Makefile b/tools/buildenv/Makefile
@@ -8,7 +8,7 @@ build:
 	  -t ghcr.io/krpc/buildenv:$(VERSION) .
 
 test:
-	docker run -t -i ghcr.io/krpc/buildenv:$(VERSION)
+	docker run -t --user 1001:121 -i ghcr.io/krpc/buildenv:$(VERSION)
 
 deploy:
 	docker push ghcr.io/krpc/buildenv:$(VERSION)

diff --git a/tools/buildenv/VERSION.txt b/tools/buildenv/VERSION.txt
@@ -1 +1 @@
-3.4.2
+3.4.3