Archives/falk-werner_webfuse
1
0
Fork 0
mirror of https://github.com/falk-werner/webfuse synced 2024-10-27 20:34:10 +00:00
Code Issues Releases Wiki Activity

changes user id mapping

Browse Source
This commit is contained in:
nosamad 2019-03-20 01:32:55 +01:00
parent 1d82e0a71f
commit 12e7af6df7
4 changed files with 13 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.travis.yml
View File

@ -1,3 +1,4 @@
language: minimal
services: services:
- docker - docker
addons: addons:

6
Makefile
View File

@ -10,8 +10,9 @@ PROJECT_ROOT ?= .
OUT ?= $(PROJECT_ROOT)/.build OUT ?= $(PROJECT_ROOT)/.build
VERSION ?= $(shell cat $(PROJECT_ROOT)/VERSION) VERSION ?= $(shell cat $(PROJECT_ROOT)/VERSION)
NPROC ?= $(shell nproc) NPROC ?= $(shell nproc)
UID ?= $(shell id -u)
DOCKER ?= docker DOCKER ?= docker
DOCKER_RUNUSER ?= $(shell id -u) DOCKER_RUNUSER ?= $(UID)
DOCKER_RUNGROUP ?= $(shell id -g) DOCKER_RUNGROUP ?= $(shell id -g)
UBUNTU_CODENAME ?= bionic UBUNTU_CODENAME ?= bionic
@ -35,6 +36,7 @@ DOCKER_RUNFLAGS += --env SOURCE_DATE_EPOCH
DOCKER_BUILDARGS += CODENAME=$(CODENAME) DOCKER_BUILDARGS += CODENAME=$(CODENAME)
DOCKER_BUILDARGS += NPROC=$(NPROC) DOCKER_BUILDARGS += NPROC=$(NPROC)
DOCKER_BUILDARGS += USERID=$(UID)
DOCKER_BUILDFLAGS += $(addprefix --build-arg ,$(DOCKER_BUILDARGS)) DOCKER_BUILDFLAGS += $(addprefix --build-arg ,$(DOCKER_BUILDARGS))
@ -103,7 +105,7 @@ $(OUT)/%/CMakeCache.txt: $(PROJECT_ROOT)/CMakeLists.txt $(OUT)/docker/% | $(OUT_
cmake -GNinja $(CMAKEFLAGS) .. && touch $@ cmake -GNinja $(CMAKEFLAGS) .. && touch $@
$(CHECK_TARGETS): GLOAS := test $(CHECK_TARGETS): GLOAS := test
$(CHECK_TARGETS): DOCKER_RUNUSER := test $(CHECK_TARGETS): DOCKER_RUNUSER := user
check-%: compile-%; check-%: compile-%;

4
docker/wsfs-builder-amd64-ubuntu.dockerfile
View File

@ -73,6 +73,8 @@ RUN set -x \
ENV LD_LIBRARY_PATH=$LD_LIBRARY_PATH:/usr/local/lib ENV LD_LIBRARY_PATH=$LD_LIBRARY_PATH:/usr/local/lib
RUN useradd -ms /bin/bash test ARG USERID=1000
RUN useradd -u $USERID -ms /bin/bash user

5
docker/wsfs-builder-arm32v7-ubuntu.dockerfile
View File

@ -75,6 +75,9 @@ RUN set -x \
ENV LD_LIBRARY_PATH=$LD_LIBRARY_PATH:/usr/local/lib ENV LD_LIBRARY_PATH=$LD_LIBRARY_PATH:/usr/local/lib
RUN useradd -ms /bin/bash test ARG USERID=1000
RUN useradd -u $USERID -ms /bin/bash user