Merge pull request #236 from pwittrock/brodocs

Run brodocs container as the current user.

Author: Phillip Wittrock

build/thirdparty/brodocs/Dockerfile

@@ -0,0 +1,17 @@
+# Builds Docker image to run brodocs
+
+FROM node:7.2
+MAINTAINER Phillip Wittrock <[email protected]>
+
+RUN apt-get update && apt-get install -y npm git && apt-get clean && rm -rf /var/lib/apt/lists/*
+
+RUN git clone --depth=1 https://github.com/Birdrock/brodocs.git
+WORKDIR brodocs
+RUN npm install
+
+COPY runbrodocs.sh .
+
+RUN rm -rf ./documents/*
+RUN chmod -R 777 .
+
+CMD ["./runbrodocs.sh"]

build/thirdparty/brodocs/runbrodocs.sh

@@ -0,0 +1,6 @@
+#!/bin/bash
+
+cp /manifest/manifest.json ./manifest.json
+cp /source/* ./documents/
+node brodoc.js
+cp -r ./* /build/

cmd/kubebuilder/docs/docs.go

@@ -21,6 +21,7 @@ import (
 	"log"
 	"os"
 	"os/exec"
+	"os/user"
 	"path/filepath"
 	"strings"
 
@@ -157,13 +158,21 @@ func RunDocs(cmd *cobra.Command, args []string) {
 	generatecmd.RunGenerate(cmd, args)
 
 	if brodocs {
+		user, err := user.Current()
+		if err != nil {
+			log.Fatalf("error: %v\n", err)
+		}
+
 		// Run the docker command to build the docs
 		c = exec.Command("docker", "run",
+			"-u", fmt.Sprintf("%s:%s", user.Uid, user.Gid),
+			"-v", "/etc/group:/etc/group:ro",
+			"-v", "/etc/passwd:/etc/passwd:ro",
 			"-v", fmt.Sprintf("%s:%s", filepath.Join(wd, outputDir, "includes"), "/source"),
 			"-v", fmt.Sprintf("%s:%s", filepath.Join(wd, outputDir, "build"), "/build"),
 			"-v", fmt.Sprintf("%s:%s", filepath.Join(wd, outputDir, "build"), "/build"),
 			"-v", fmt.Sprintf("%s:%s", filepath.Join(wd, outputDir), "/manifest"),
-			"gcr.io/kubebuilder/brodocs",
+			"gcr.io/kubebuilder/brodocs:v0.1.11",
 		)
 		if verbose {
 			log.Println(strings.Join(c.Args, " "))