Kouhei Sutou
null+****@clear*****
Thu Mar 30 14:31:51 JST 2017
Kouhei Sutou 2017-03-30 14:31:51 +0900 (Thu, 30 Mar 2017) New Revision: a346f23fac16fb327d861dc4aa4b3ec58921bd3d https://github.com/groonga/groonga/commit/a346f23fac16fb327d861dc4aa4b3ec58921bd3d Message: package windows: create user for building package Added files: packages/windows/.dockerignore Modified files: packages/windows/Dockerfile packages/windows/Makefile.am Added: packages/windows/.dockerignore (+3 -0) 100644 =================================================================== --- /dev/null +++ packages/windows/.dockerignore 2017-03-30 14:31:51 +0900 (431f1d2) @@ -0,0 +1,3 @@ +dist-*/ +files/ +tmp/ Modified: packages/windows/Dockerfile (+27 -11) =================================================================== --- packages/windows/Dockerfile 2017-03-30 13:50:24 +0900 (0eb1baa) +++ packages/windows/Dockerfile 2017-03-30 14:31:51 +0900 (d505a46) @@ -3,18 +3,34 @@ FROM debian RUN dpkg --add-architecture i386 RUN apt update RUN apt install -V -y \ - build-essential \ - devscripts \ - autoconf \ - libtool \ - cmake \ - pkg-config \ - mingw-w64 \ - wine \ - wine-binfmt \ - rsync \ - ruby + build-essential \ + devscripts \ + autoconf \ + libtool \ + cmake \ + pkg-config \ + mingw-w64 \ + wine \ + wine-binfmt \ + rsync \ + ruby RUN gem install rake +ARG WORK_UID=${WORK_UID} +ARG WORK_GID=${WORK_GID} +ARG WORK_USER=${WORK_USER} +ARG WORK_GROUP=${WORK_GROUP} + +RUN groupadd \ + --gid ${WORK_GID} \ + ${WORK_GROUP} +RUN useradd \ + --uid ${WORK_UID} \ + --gid ${WORK_GID} \ + --create-home \ + ${WORK_USER} + +WORKDIR /home/${WORK_USER} + CMD ["/build/build.sh"] Modified: packages/windows/Makefile.am (+7 -3) =================================================================== --- packages/windows/Makefile.am 2017-03-30 13:50:24 +0900 (eee8625) +++ packages/windows/Makefile.am 2017-03-30 14:31:51 +0900 (d7d0454) @@ -38,9 +38,13 @@ prepare-build: echo "MEMORY_DEBUG_BUILD='$(MEMORY_DEBUG_BUILD)'"; \ echo "ARCHITECTURES='$(ARCHITECTURES)'"; \ ) > tmp/env.sh - docker build \ - --tag groonga/windows-build \ - --force-rm \ + docker build \ + --tag groonga/windows-build \ + --force-rm \ + --build-arg WORK_UID=$$(id --user) \ + --build-arg WORK_GID=$$(id --group) \ + --build-arg WORK_USER=$$(id --user --name) \ + --build-arg WORK_GROUP=$$(id --group --name) \ $(srcdir) build: source -------------- next part -------------- HTML����������������������������...Download