Skip to content

Commit 7b3f6ce

Browse files
authored
Merge pull request #125 from pwittrock/fix-docs
Update docs to use new apiserver builder version
2 parents 436988b + d598c2b commit 7b3f6ce

File tree

2 files changed

+7
-7
lines changed

2 files changed

+7
-7
lines changed

build/apiserverbuilder/Dockerfile

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -16,19 +16,19 @@
1616

1717
FROM golang:1.10-stretch
1818

19-
ENV URL https://github.com/kubernetes-incubator/apiserver-builder/releases/download/v1.9-alpha.2
20-
ENV BIN apiserver-builder-v1.9-alpha.2-linux-amd64.tar.gz
19+
RUN apt-get update
20+
RUN apt-get install less -y
21+
RUN apt-get install nano -y
22+
23+
ENV URL https://github.com/kubernetes-incubator/apiserver-builder/releases/download/v1.9-alpha.4
24+
ENV BIN apiserver-builder-v1.9-alpha.4-linux-amd64.tar.gz
2125
ENV DEST /usr/local/apiserver-builder/bin/
2226
RUN curl -L $URL/$BIN -o /tmp/$BIN
2327
RUN mkdir -p /usr/local/apiserver-builder
2428
RUN tar -xzvf /tmp/$BIN -C /usr/local/apiserver-builder/
2529

2630
ENV PATH /usr/local/apiserver-builder/bin/:$PATH
2731

28-
RUN apt-get update
29-
RUN apt-get install less -y
30-
RUN apt-get install nano -yu
31-
3232
COPY docs.sh /usr/local/bin/docs.sh
3333

3434
CMD docs.sh

cmd/kubebuilder/docs/docs.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -108,7 +108,7 @@ func RunDocs(cmd *cobra.Command, args []string) {
108108
"-e", "DOMAIN="+util.GetDomain(),
109109
"-e", "DIR="+filepath.Join("src", util.Repo),
110110
"-e", "OUTPUT="+outputDir,
111-
"gcr.io/kubebuilder/gendocs",
111+
"gcr.io/kubebuilder/gendocs:alpha4",
112112
)
113113
if verbose {
114114
log.Println(strings.Join(c.Args, " "))

0 commit comments

Comments
 (0)