build, feat: use current user name in docker.

fibjs · Nov 29, 2022 · 7808079 · 7808079
1 parent f91648f
commit 7808079
Show file tree

Hide file tree

Showing 7 changed files with 31 additions and 1 deletion.
diff --git a/build b/build
@@ -41,7 +41,8 @@ if [[ $BUILD_OS ]]; then
 		args="amd64"
 	fi
 
-	docker run --rm -v ${SOURCE_ROOT}:/fibjs fibjs/${BUILD_OS}-build-env:${BUILD_ARCH} bash -c "cd /fibjs; bash build ${args}"
+	docker run --rm -v ${SOURCE_ROOT}:/fibjs fibjs/${BUILD_OS}-build-env:${BUILD_ARCH}\
+		bash -c "cd /fibjs; usermod --login ${USER} fibjs; sudo -u ${USER} bash build ${args}"
 	exit $?
 fi
 

diff --git a/dockerfiles/alpine-build-env.amd64 b/dockerfiles/alpine-build-env.amd64
@@ -12,3 +12,7 @@ RUN apk add g++
 RUN apk add linux-headers
 RUN apk add libx11-dev
 RUN apk add xz
+RUN apk add sudo
+RUN apk add shadow
+
+RUN adduser --disabled-password fibjs
diff --git a/dockerfiles/alpine-build-env.arm64 b/dockerfiles/alpine-build-env.arm64
@@ -2,3 +2,5 @@ FROM dockcross/linux-arm64-musl
 
 LABEL AUTHOR="xicilion"
 LABEL AUTHOR_EMAIL="lion@9465.net"
+
+RUN adduser fibjs -q
diff --git a/dockerfiles/android-build-env.amd64 b/dockerfiles/android-build-env.amd64
@@ -2,3 +2,5 @@ FROM dockcross/android-x86_64
 
 LABEL AUTHOR="xicilion"
 LABEL AUTHOR_EMAIL="lion@9465.net"
+
+RUN adduser fibjs -q
diff --git a/dockerfiles/android-build-env.arm64 b/dockerfiles/android-build-env.arm64
@@ -2,3 +2,5 @@ FROM dockcross/android-arm64
 
 LABEL AUTHOR="xicilion"
 LABEL AUTHOR_EMAIL="lion@9465.net"
+
+RUN adduser fibjs -q
diff --git a/dockerfiles/linux-build-env.amd64 b/dockerfiles/linux-build-env.amd64
@@ -4,6 +4,8 @@ LABEL AUTHOR="xicilion"
 LABEL AUTHOR_EMAIL="lion@9465.net"
 
 RUN apt-get update
+RUN apt-get install sudo -y
+
 RUN apt-get install make -y
 RUN apt-get install cmake -y
 RUN apt-get install ccache -y
@@ -12,3 +14,5 @@ RUN apt-get install libx11-dev -y
 
 RUN apt-get install clang -y
 RUN apt-get install g++ -y
+
+RUN adduser fibjs -q
diff --git a/dockerfiles/push-image.sh b/dockerfiles/push-image.sh
@@ -0,0 +1,15 @@
+docker image push fibjs/android-build-env:amd64
+docker image push fibjs/android-build-env:arm64
+
+docker image push fibjs/linux-build-env:amd64
+docker image push fibjs/linux-build-env:i386
+docker image push fibjs/linux-build-env:arm64
+docker image push fibjs/linux-build-env:arm
+docker image push fibjs/linux-build-env:mips64
+docker image push fibjs/linux-build-env:mips
+
+docker image push fibjs/alpine-build-env:amd64
+docker image push fibjs/alpine-build-env:arm64
+
+docker image push fibjs/alpine-test-env:arm64
+docker image push fibjs/alpine-test-env:amd64