From 7c73c34cf5442532b4008bb1821b20f7b994d94a Mon Sep 17 00:00:00 2001 From: Karen Almog Date: Fri, 18 May 2018 12:32:55 +0200 Subject: [PATCH 1/4] remove terraform-examples from the tectonic-builder image --- images/tectonic-builder/Dockerfile | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/images/tectonic-builder/Dockerfile b/images/tectonic-builder/Dockerfile index eec9d82ad9..32a2eadf19 100644 --- a/images/tectonic-builder/Dockerfile +++ b/images/tectonic-builder/Dockerfile @@ -20,8 +20,7 @@ RUN go get github.com/jstemmer/go-junit-report ### Tools used by 'make structure-check' RUN go get github.com/segmentio/terraform-docs -RUN go get github.com/coreos/tectonic-installer/contrib/terraform-examples && \ - rm -rf /go/src/github.com/coreos/tectonic-installer/ +RUN rm -rf /go/src/github.com/coreos/tectonic-installer/ RUN go get github.com/bronze1man/yaml2json ### License parser From 5d1960ea4bffcdcf6d07dfb882f577bc6461bd54 Mon Sep 17 00:00:00 2001 From: Karen Almog Date: Thu, 17 May 2018 15:42:55 +0200 Subject: [PATCH 2/4] images: Pin bazel to specific version in docker image --- images/tectonic-builder/Dockerfile.bazel | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/images/tectonic-builder/Dockerfile.bazel b/images/tectonic-builder/Dockerfile.bazel index f5aed1021a..d5510ab1da 100644 --- a/images/tectonic-builder/Dockerfile.bazel +++ b/images/tectonic-builder/Dockerfile.bazel @@ -1,12 +1,18 @@ FROM openjdk:8 +ENV BAZEL_VERSION="0.12.0" RUN echo "deb [arch=amd64] http://storage.googleapis.com/bazel-apt testing jdk1.8" | \ tee /etc/apt/sources.list.d/bazel.list && \ curl https://bazel.build/bazel-release.pub.gpg | apt-key add - -RUN apt-get update \ - && apt-get -y install bazel \ - && rm -rf /var/lib/apt/lists/* +RUN apt-get update && apt-get install -y --no-install-recommends \ + bash-completion \ + g++ \ + zlib1g-dev \ + && curl -LO "https://github.com/bazelbuild/bazel/releases/download/${BAZEL_VERSION}/bazel_${BAZEL_VERSION}-linux-x86_64.deb" \ + && dpkg -i bazel_*.deb + +RUN apt --fix-broken install -y # Install Chrome for installer gui tests # Use Chrome beta because v60 or higher is needed for headless mode From 3508f2c9a8c50555fd8fe6efd4ba0d8642004bd8 Mon Sep 17 00:00:00 2001 From: Karen Almog Date: Fri, 18 May 2018 16:48:02 +0200 Subject: [PATCH 3/4] bump tectonic-builder version --- Jenkinsfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Jenkinsfile b/Jenkinsfile index 6eab16a768..3b552f7230 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -48,7 +48,7 @@ quayCreds = [ ) ] -defaultBuilderImage = 'quay.io/coreos/tectonic-builder:v1.45' +defaultBuilderImage = 'quay.io/coreos/tectonic-builder:v1.46' tectonicSmokeTestEnvImage = 'quay.io/coreos/tectonic-smoke-test-env:v5.16' tectonicBazelImage = 'quay.io/coreos/tectonic-builder:bazel-v0.3' originalCommitId = 'UNKNOWN' From b37e35051ff1cf3100fd0071bf72f4bafac92fb7 Mon Sep 17 00:00:00 2001 From: Karen Almog Date: Tue, 22 May 2018 13:56:04 +0200 Subject: [PATCH 4/4] Remove terraform-docs from the docker image --- images/tectonic-builder/Dockerfile | 1 - 1 file changed, 1 deletion(-) diff --git a/images/tectonic-builder/Dockerfile b/images/tectonic-builder/Dockerfile index 32a2eadf19..0520713d34 100644 --- a/images/tectonic-builder/Dockerfile +++ b/images/tectonic-builder/Dockerfile @@ -19,7 +19,6 @@ RUN go get -u github.com/golang/lint/golint RUN go get github.com/jstemmer/go-junit-report ### Tools used by 'make structure-check' -RUN go get github.com/segmentio/terraform-docs RUN rm -rf /go/src/github.com/coreos/tectonic-installer/ RUN go get github.com/bronze1man/yaml2json