github
/
k3s
mirror of https://github.com/k3s-io/k3s
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

upgrading sample-apiserver to 1.10

pull/58/head
Federico Bongiovanni 2018-09-28 11:55:58 -07:00 committed by fedebongio
parent c4b4025ca4
commit 54ba2ae877
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
test/images/sample-apiserver/Dockerfile
View File

@ -12,7 +12,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.
FROM k8s.gcr.io/kube-cross:v1.10.4-1 as build_k8s_1_7_sample_apiserver
FROM k8s.gcr.io/kube-cross:v1.10.4-1 as build_k8s_1_10_sample_apiserver
ENV GOPATH /go
RUN mkdir -p ${GOPATH}/src ${GOPATH}/bin
@ -23,7 +23,7 @@ ENV PATH $GOPATH/bin:$PATH
# API Server using the current Aggregator"
RUN go get -d k8s.io/sample-apiserver \
&& cd ${GOPATH}/src/k8s.io/sample-apiserver \
&& git checkout --track origin/release-1.7 \
&& git checkout --track origin/release-1.10 \
&& CGO_ENABLED=0 GOOS=linux GOARCH=BASEARCH go install .
# for arm, go install uses go/bin/linux_arm, so just find the file and copy it to the root so
@ -31,6 +31,6 @@ RUN go get -d k8s.io/sample-apiserver \
RUN find /go/bin -name sample-apiserver -exec cp {} / \;
FROM BASEIMAGE
COPY --from=build_k8s_1_7_sample_apiserver /sample-apiserver /sample-apiserver
COPY --from=build_k8s_1_10_sample_apiserver /sample-apiserver /sample-apiserver
ENTRYPOINT ["/sample-apiserver"]

2
test/images/sample-apiserver/VERSION
View File

@ -1 +1 @@
1.0
1.10