From 3ef60636167bb5a193fcd6ed5d2b96b3c4e2a0d9 Mon Sep 17 00:00:00 2001 From: Jason Riddle Date: Fri, 21 Dec 2018 14:28:38 -0800 Subject: [PATCH 1/4] Allow ksonnet version to be specified --- Dockerfile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index b2fbd2b..d296fca 100644 --- a/Dockerfile +++ b/Dockerfile @@ -45,6 +45,7 @@ RUN CGO_ENABLED=1 GOOS=linux go install -a --ldflags '-linkmode external -extldf FROM alpine:3.6 ENV KUBECFG_VERSION v0.5.0 ENV JSONNET_VERSION v0.9.4 +ENV KSONNET_VERSION ksonnet.beta.2 # Copy kubecfg executable and lib files from previous stage RUN mkdir -p /usr/share/kubecfg/${KUBECFG_VERSION} @@ -60,4 +61,4 @@ RUN cd jsonnet && git checkout tags/${JSONNET_VERSION} -b ${JSONNET_VERSION} && # Get ksonnet-lib, add to the Jsonnet -J path. RUN git clone https://github.com/ksonnet/ksonnet-lib.git RUN mkdir -p /usr/share/${JSONNET_VERSION} -RUN cp -r ksonnet-lib/ksonnet.beta.2 /usr/share/${JSONNET_VERSION} +RUN cp -r ksonnet-lib/${KSONNET_VERSION} /usr/share/${JSONNET_VERSION} From 2643ee346f22c2c5771664dff1e657a0bb2975b5 Mon Sep 17 00:00:00 2001 From: Jason Riddle Date: Fri, 21 Dec 2018 14:29:02 -0800 Subject: [PATCH 2/4] Bump jsonnet to v0.12.1 --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index d296fca..ea83848 100644 --- a/Dockerfile +++ b/Dockerfile @@ -44,7 +44,7 @@ RUN CGO_ENABLED=1 GOOS=linux go install -a --ldflags '-linkmode external -extldf FROM alpine:3.6 ENV KUBECFG_VERSION v0.5.0 -ENV JSONNET_VERSION v0.9.4 +ENV JSONNET_VERSION v0.12.1 ENV KSONNET_VERSION ksonnet.beta.2 # Copy kubecfg executable and lib files from previous stage From 05cf716435b37a443eb1c2795121eff3650cee2b Mon Sep 17 00:00:00 2001 From: Jason Riddle Date: Fri, 21 Dec 2018 14:29:30 -0800 Subject: [PATCH 3/4] Bump kubecfg to v0.9.0 --- Dockerfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index ea83848..aa47ae7 100644 --- a/Dockerfile +++ b/Dockerfile @@ -31,7 +31,7 @@ FROM golang:1.8 as kubecfg-builder # Keep this in sync with the corresponding ENV in stage 2 -ENV KUBECFG_VERSION v0.5.0 +ENV KUBECFG_VERSION v0.9.0 RUN go get github.com/ksonnet/kubecfg WORKDIR /go/src/github.com/ksonnet/kubecfg @@ -43,7 +43,7 @@ RUN CGO_ENABLED=1 GOOS=linux go install -a --ldflags '-linkmode external -extldf ############################################## FROM alpine:3.6 -ENV KUBECFG_VERSION v0.5.0 +ENV KUBECFG_VERSION v0.9.0 ENV JSONNET_VERSION v0.12.1 ENV KSONNET_VERSION ksonnet.beta.2 From 00fdd95e993991f5f1ff2e3587d87b829bc817fc Mon Sep 17 00:00:00 2001 From: Jason Riddle Date: Fri, 21 Dec 2018 14:58:54 -0800 Subject: [PATCH 4/4] Update jpath library search path See: https://github.com/google/jsonnet/blob/520961df765b1744b1576bfda00c68311b826d87/core/libjsonnet.cpp#L184-L185 --- Dockerfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index aa47ae7..ed18840 100644 --- a/Dockerfile +++ b/Dockerfile @@ -60,5 +60,5 @@ RUN cd jsonnet && git checkout tags/${JSONNET_VERSION} -b ${JSONNET_VERSION} && # Get ksonnet-lib, add to the Jsonnet -J path. RUN git clone https://github.com/ksonnet/ksonnet-lib.git -RUN mkdir -p /usr/share/${JSONNET_VERSION} -RUN cp -r ksonnet-lib/${KSONNET_VERSION} /usr/share/${JSONNET_VERSION} +RUN mkdir -p /usr/share/jsonnet-${JSONNET_VERSION} +RUN cp -r ksonnet-lib/${KSONNET_VERSION} /usr/share/jsonnet-${JSONNET_VERSION}