Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update software in the build image used by CircleCI. #1874

Merged
merged 1 commit into from
Jul 25, 2018
Merged

Update software in the build image used by CircleCI. #1874

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
10 changes: 5 additions & 5 deletions .circleci/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,24 +10,24 @@ FROM circleci/openjdk:latest

# clang is used for TSAN and ASAN tests
RUN sudo sh -c 'curl http://apt.llvm.org/llvm-snapshot.gpg.key | apt-key add -'
RUN sudo sh -c 'echo "deb http://apt.llvm.org/stretch/ llvm-toolchain-stretch-5.0 main" > /etc/apt/sources.list.d/llvm.list'
RUN sudo sh -c 'echo "deb http://apt.llvm.org/stretch/ llvm-toolchain-stretch-6.0 main" > /etc/apt/sources.list.d/llvm.list'

RUN sudo apt-get update && \
sudo apt-get -y install \
wget software-properties-common make cmake python python-pip pkg-config \
zlib1g-dev bash-completion bc libtool automake zip time g++-6 gcc-6 \
clang-5.0 rsync
clang-6.0 rsync

# ~100M, depends on g++, zlib1g-dev, bash-completions
RUN curl -Lo /tmp/bazel.deb https://github.com/bazelbuild/bazel/releases/download/0.11.0/bazel_0.11.0-linux-x86_64.deb && \
RUN curl -Lo /tmp/bazel.deb https://github.com/bazelbuild/bazel/releases/download/0.15.2/bazel_0.15.2-linux-x86_64.deb && \
sudo dpkg -i /tmp/bazel.deb && rm /tmp/bazel.deb


# Instead of "apt-get -y install golang"
RUN cd /tmp && \
wget https://redirector.gvt1.com/edgedl/go/go1.9.2.linux-amd64.tar.gz && \
wget https://redirector.gvt1.com/edgedl/go/go1.10.3.linux-amd64.tar.gz && \
sudo rm -rf /usr/local/go && \
sudo tar -C /usr/local -xzf go1.9.2.linux-amd64.tar.gz && \
sudo tar -C /usr/local -xzf go1.10.3.linux-amd64.tar.gz && \
sudo chown -R circleci /usr/local/go && \
sudo ln -s /usr/local/go/bin/go /usr/local/bin

Expand Down
2 changes: 1 addition & 1 deletion .circleci/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ HUB ?=
PROJECT ?= istio

# Using same naming convention as istio/istio
VERSION ?= go1.9-bazel0.11
VERSION ?= go1.10-bazel0.15-clang6.0
IMG ?= ci

# Build a local image, can be used for testing with circleci command line.
Expand Down