Skip to content
This repository was archived by the owner on Feb 5, 2020. It is now read-only.

images: Pin bazel to specific version in docker image #3239

Merged
trawler merged 4 commits into from
May 22, 2018
Merged

images: Pin bazel to specific version in docker image #3239

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
7c73c34
remove terraform-examples from the tectonic-builder image
May 18, 2018
5d1960e
images: Pin bazel to specific version in docker image
May 17, 2018
3508f2c
bump tectonic-builder version
May 18, 2018
b37e350
Remove terraform-docs from the docker image
May 22, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Jenkinsfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand Down
4 changes: 1 addition & 3 deletions images/tectonic-builder/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,9 +19,7 @@ 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 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
Expand Down
12 changes: 9 additions & 3 deletions images/tectonic-builder/Dockerfile.bazel
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Copy link
Contributor

@enxebre enxebre May 22, 2018

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

can you clarify why do we need the additional libraries above and this last RUN?

Copy link
Contributor Author

@trawler trawler May 22, 2018

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Google removes all older bazel versions from their apt repo. So in order to fetch older versions we need to install it from github. The last RUN is supposed to install all the declared dependencies in the deb file.

Copy link
Contributor Author

@trawler trawler May 22, 2018

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

the additional libraries are required per the documentation: https://docs.bazel.build/versions/master/install-ubuntu.html


# Install Chrome for installer gui tests
# Use Chrome beta because v60 or higher is needed for headless mode
Expand Down