Don't run as root when building protobuf files

Signed-off-by: Fredrik Skogman <kommendorkapten@github.com>

Dockerfile

@@ -6,15 +6,23 @@ RUN set -ex && \
     apt-get install -y --no-install-recommends \
     python3-pip
 
+# Install Python dev dependencies.
+COPY ./dev-requirements.txt /tmp/
+RUN python3 -m pip install --upgrade pip && \
+    python3 -m pip install --requirement /tmp/dev-requirements.txt
+
 # Install Rust cargo.
 RUN set -ex && \
     apt-get install -y --no-install-recommends \
         curl \
-        build-essential
-RUN curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | bash -s -- -y
-ENV PATH="/root/.cargo/bin:${PATH}"
+    build-essential
 
-# Install Python dev dependencies.
-COPY ./dev-requirements.txt /tmp/
-RUN python3 -m pip install --upgrade pip && \
-    python3 -m pip install --requirement /tmp/dev-requirements.txt
+# Switch user
+ARG uid=1000
+RUN useradd -u ${uid} -s /bin/sh -m builder
+
+USER builder
+WORKDIR /home/builder
+
+RUN curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | bash -s -- -y
+ENV PATH="/home/builder/.cargo/bin:${PATH}"

Dockerfile.jsonschema

@@ -1,7 +1,19 @@
 # 3.18.2
 FROM alpine@sha256:c5b1261d6d3e43071626931fc004f70149baeba2c8ec672bd4f27761f8e1ad6b
 RUN apk add --update protoc protobuf-dev go git
+
+# Switch user
+ARG uid=1000
+RUN adduser -u ${uid} -S builder
+
+RUN mkdir -p /home/builder
+RUN chown builder /home/builder
+
+USER builder
+WORKDIR /home/builder
+
 RUN go install github.com/chrusty/protoc-gen-jsonschema/cmd/protoc-gen-jsonschema@1.4.1
+
 # This is required to get the field_behavior.proto file
 # NOTE: --filter=tree:0 performs a treeless clone; we do this to optimize cloning
 # this otherwise relatively heavy repository.

Makefile

@@ -19,75 +19,71 @@ JSONSCHEMA_IMAGE=jsonschema-specs-build
 # generate all language protobuf code
 all: go python typescript ruby rust jsonschema
 
+CUSER=$(shell id -u ${USER})
+CGROUP=$(shell id -g ${USER})
+DOCKER_RUN=docker run --platform linux/amd64 -u ${CUSER}:${CGROUP} -v ${PWD}:/defs
+DOCKER_BUILD=docker build --platform linux/amd64 --build-arg uid=${CUSER}
+
 # generate Go protobuf code
 go: docker-image
 	@echo "Generating go protobuf files"
-	docker run --platform linux/amd64 -v ${PWD}:/defs ${PROTOC_IMAGE} -d protos -l go --go-module-prefix github.com/sigstore/protobuf-specs/gen/pb-go
+	${DOCKER_RUN} ${PROTOC_IMAGE} \
+		-d /defs/protos \
+		-o /defs/gen/pb-go \
+		-l go --go-module-prefix github.com/sigstore/protobuf-specs/gen/pb-go
 
 python: docker-image
 	@echo "Generating python protobuf files"
 # we need to manually fix the PYTHONPATH due to: https://github.com/namely/docker-protoc/pull/356
-	docker run \
-		--platform linux/amd64 \
-		-v ${PWD}:/defs \
-		-e PYTHONPATH="/opt/mypy-protobuf/" \
+	${DOCKER_RUN} -e PYTHONPATH="/opt/mypy-protobuf/" \
 		--entrypoint bash ${PROTOC_IMAGE} \
-		-c "cd ./gen/pb-python/sigstore_protobuf_specs && protoc -I/opt/include -I../../../protos/ --python_betterproto_out=. ../../../protos/*.proto"
+		-c "cd /defs/gen/pb-python/sigstore_protobuf_specs && protoc -I/opt/include -I../../../protos/ --python_betterproto_out=. ../../../protos/*.proto"
 
 typescript: docker-image
 	@echo "Generating javascript protobuf files"
-	docker run \
-		--platform linux/amd64 \
-		-v ${PWD}:/defs \
-		${PROTOC_IMAGE} \
-		-d protos -l typescript -o ./gen/pb-typescript/src/__generated__ --ts_opt oneof=unions,forceLong=string,env=node,exportCommonSymbols=false,outputPartialMethods=false,outputEncodeMethods=false,unrecognizedEnum=false
+	${DOCKER_RUN} ${PROTOC_IMAGE} \
+		-d /defs/protos -l typescript \
+		-o /defs/gen/pb-typescript/src/__generated__ \
+		--ts_opt oneof=unions,forceLong=string,env=node,exportCommonSymbols=false,outputPartialMethods=false,outputEncodeMethods=false,unrecognizedEnum=false
 
 ruby: docker-image
 	@echo "Generating ruby protobuf files"
-	docker run \
-		--platform linux/amd64 \
-		-v ${PWD}:/defs \
-		--entrypoint bash ${PROTOC_IMAGE} \
-		-c "cd ./gen/pb-ruby && protoc -I/opt/include -I../../protos/ --ruby_out=lib ../../protos/*.proto"
+	${DOCKER_RUN} --entrypoint bash ${PROTOC_IMAGE} \
+		-c "cd /defs/gen/pb-ruby && protoc -I/opt/include -I../../protos/ --ruby_out=lib ../../protos/*.proto"
 
 jsonschema: docker-image-jsonschema
 	@echo "Generating JSON schema files"
-	docker run \
-	       -v ${PWD}:/defs \
-	       --entrypoint sh \
-	       ${JSONSCHEMA_IMAGE} \
-	       -c "cd defs/gen/jsonschema && ./jsonschema.sh -I ../../protos -I /googleapis/ --jsonschema_out=schemas ../../protos/*.proto"
+	${DOCKER_RUN} --entrypoint sh \
+		${JSONSCHEMA_IMAGE} \
+		-c "cd /defs/gen/jsonschema && ./jsonschema.sh -I ../../protos -I /home/builder/googleapis/ --jsonschema_out=schemas ../../protos/*.proto"
 
 gen/pb-rust/schemas: jsonschema
 	cp -r gen/jsonschema/schemas gen/pb-rust
 
 rust: docker-image gen/pb-rust/schemas
 	@echo "Generating rust protobuf files"
-	docker run \
-		--platform linux/amd64 \
-		-v ${PWD}:/defs \
-		-e "RUST_BACKTRACE=1" \
+	${DOCKER_RUN} -e "RUST_BACKTRACE=1" \
 		--entrypoint bash ${PROTOC_IMAGE} \
-		-c "cd gen/pb-rust && cargo build"
+		-c "cd /defs/gen/pb-rust && cargo build"
 
 # docker already does its own caching so we can attempt a build every time
 .PHONY: docker-image
 docker-image:
 	@echo "Building development docker image"
-	docker build -t ${PROTOC_IMAGE} .
+	${DOCKER_BUILD} -t ${PROTOC_IMAGE} .
 
 # to recover from a situation where a stale layer exist, just  purging the
 # docker image via `make clean` is not enough. Re-building without layer
 # cache is the only solution.
 .PHONY: docker-image-no-cache
 docker-image-no-cache:
 	@echo "Building development docker image with disabled cache"
-	docker build --no-cache -t ${PROTOC_IMAGE} .
+	${DOCKER_BUILD} --no-cache -t ${PROTOC_IMAGE} .
 
 .PHONY: docker-image-jsonschema
 docker-image-jsonschema:
 	@echo "Building docker image for generating JSON schema files"
-	docker build -t ${JSONSCHEMA_IMAGE} -f Dockerfile.jsonschema .
+	${DOCKER_BUILD} -t ${JSONSCHEMA_IMAGE} -f Dockerfile.jsonschema .
 
 # clean up generated files (not working? try sudo make clean)
 clean:
@@ -97,7 +93,7 @@ clean:
 		gen/pb-python/sigstore_protobuf_specs/io \
 		gen/pb-rust/schemas \
 		gen/pb-rust/target
-	docker rmi -f ${PROTOC_IMAGE}
+	docker rmi -f ${PROTOC_IMAGE} ${JSONSCHEMA_IMAGE}
 
 help:
 	docker run --pull always --platform linux/amd64 -v ${PWD}:/defs ${PROTOC_IMAGE}

gen/jsonschema/jsonschema.sh

@@ -3,7 +3,7 @@
 set -u
 set -e
 
-protoc --plugin=/root/go/bin/protoc-gen-jsonschema \
+protoc --plugin=/home/builder/go/bin/protoc-gen-jsonschema \
        --jsonschema_opt=disallow_additional_properties \
        --jsonschema_opt=enforce_oneof \
        --jsonschema_opt=enums_as_strings_only \