You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@geode.apache.org by ab...@apache.org on 2018/04/20 19:34:44 UTC
[geode] branch develop updated: GEODE-5119 - add spruce to ci
docker image.
This is an automated email from the ASF dual-hosted git repository.
abaker pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/geode.git
The following commit(s) were added to refs/heads/develop by this push:
new 179fc13 GEODE-5119 - add spruce to ci docker image.
179fc13 is described below
commit 179fc1378950073640fb5519ed7ffbce2c28a512
Author: Sean Goller <sg...@pivotal.io>
AuthorDate: Fri Apr 20 11:45:07 2018 -0700
GEODE-5119 - add spruce to ci docker image.
Signed-off-by: Robert Houghton <rh...@pivotal.io>
---
ci/docker/Dockerfile | 91 +++++++++++++++++++++++++++------------------------
ci/docker/docker.list | 2 +-
2 files changed, 49 insertions(+), 44 deletions(-)
diff --git a/ci/docker/Dockerfile b/ci/docker/Dockerfile
index d124fd2..6651d4e 100644
--- a/ci/docker/Dockerfile
+++ b/ci/docker/Dockerfile
@@ -16,57 +16,62 @@
FROM openjdk:8
ENTRYPOINT []
-# apt prerequisites for installing docker and gcloud
-RUN curl https://packages.cloud.google.com/apt/doc/apt-key.gpg | apt-key add -
-RUN apt-key adv --keyserver hkp://pgp.mit.edu --recv-keys 58118E89F3A912897C070ADBF76221572C52609D
-RUN apt-get update
-RUN apt-get install -y apt-transport-https ca-certificates aptitude lsb-release jq unzip vim htop golang cgroupfs-mount python3 python3-pip
-ADD docker.list /etc/apt/sources.list.d/
-RUN echo "deb http://packages.cloud.google.com/apt cloud-sdk-$(lsb_release -c -s) main" | tee -a /etc/apt/sources.list.d/google-cloud-sdk.list
-
-# Install docker and gcloud
-RUN apt-get update
-RUN apt-get purge lxc-docker
-RUN apt-get install -y docker-engine docker-compose google-cloud-sdk && apt-get clean
+ARG CHROME_DRIVER_VERSION=2.35
+ENV SPRUCE_VERSION 1.17.0
+ENV GRADLE_USER_HOME /usr/local/maven_files
-# For a CI tool, disable updates to gcloud since they'll be thrown away at end of run
-RUN gcloud config set core/disable_usage_reporting true && \
- gcloud config set component_manager/disable_update_check true && \
- gcloud config set metrics/environment github_docker_image
+WORKDIR /tmp/work
-# Install Tini and associated wrapper
+ADD https://github.com/geofffranks/spruce/releases/download/v${SPRUCE_VERSION}/spruce-linux-amd64 /usr/local/bin/spruce
+ADD docker.list /etc/apt/sources.list.d/
ADD https://github.com/krallin/tini/releases/download/v0.14.0/tini-static-amd64 /usr/local/bin/tini
-RUN chmod +x /usr/local/bin/tini
ADD tini-wrapper.go .
-RUN go build -o /usr/local/bin/tini-wrapper ./tini-wrapper.go
-
-# Init script for docker inside our workers
ADD ./initdocker /usr/local/bin/initdocker
-RUN chmod +x /usr/local/bin/initdocker
-
-# Install dunit-process
-RUN curl -Lo /usr/local/bin/dunit-progress https://github.com/jdeppe-pivotal/progress-util/releases/download/0.2/progress.linux
-RUN chmod +x /usr/local/bin/dunit-progress
-
-# Install Chrome
-RUN curl -sSL https://dl.google.com/linux/linux_signing_key.pub | apt-key add - \
- && echo "deb [arch=amd64] https://dl.google.com/linux/chrome/deb/ stable main" > /etc/apt/sources.list.d/google-chrome.list \
- && apt-get update && apt-get install -y google-chrome-stable --no-install-recommends \
- && rm -rf /var/lib/apt/lists/*
+ADD cache_dependencies.sh cache_dependencies.sh
-# Install Chrome driver
-ARG CHROME_DRIVER_VERSION=2.35
-RUN wget --no-verbose -O /tmp/chromedriver_linux64.zip https://chromedriver.storage.googleapis.com/$CHROME_DRIVER_VERSION/chromedriver_linux64.zip \
+RUN chmod +x /usr/local/bin/tini \
+ && chmod +x /usr/local/bin/spruce \
+ && chmod +x /usr/local/bin/initdocker \
+ && chmod +x cache_dependencies.sh \
+ && apt-get update \
+ && apt-get install -y --no-install-recommends lsb-release \
+ && echo "deb [arch=amd64] http://dl.google.com/linux/chrome/deb/ stable main" > /etc/apt/sources.list.d/google-chrome.list \
+ && echo "deb http://packages.cloud.google.com/apt cloud-sdk-$(lsb_release -c -s) main" | tee -a /etc/apt/sources.list.d/google-cloud-sdk.list \
+ && curl -sSL https://dl.google.com/linux/linux_signing_key.pub | apt-key add - \
+ && curl https://packages.cloud.google.com/apt/doc/apt-key.gpg | apt-key add - \
+ && apt-key adv --keyserver hkp://p80.pool.sks-keyservers.net:80 --recv-keys 58118E89F3A912897C070ADBF76221572C52609D \
+ && apt-get update \
+ && apt-get purge lxc-docker \
+ && apt-get install -y --no-install-recommends \
+ apt-transport-https \
+ aptitude \
+ ca-certificates \
+ cgroupfs-mount \
+ docker-compose \
+ docker-engine \
+ golang \
+ google-chrome-stable \
+ google-cloud-sdk \
+ htop \
+ jq \
+ python3 \
+ python3-pip \
+ unzip \
+ vim \
+ && gcloud config set core/disable_usage_reporting true \
+ && gcloud config set component_manager/disable_update_check true \
+ && gcloud config set metrics/environment github_docker_image \
+ && go build -o /usr/local/bin/tini-wrapper ./tini-wrapper.go \
+ && curl -Lo /usr/local/bin/dunit-progress https://github.com/jdeppe-pivotal/progress-util/releases/download/0.2/progress.linux \
+ && chmod +x /usr/local/bin/dunit-progress \
+ && wget --no-verbose -O /tmp/chromedriver_linux64.zip https://chromedriver.storage.googleapis.com/$CHROME_DRIVER_VERSION/chromedriver_linux64.zip \
&& rm -rf /opt/selenium/chromedriver \
&& unzip /tmp/chromedriver_linux64.zip -d /opt/selenium \
&& rm /tmp/chromedriver_linux64.zip \
&& mv /opt/selenium/chromedriver /opt/selenium/chromedriver-$CHROME_DRIVER_VERSION \
&& chmod 755 /opt/selenium/chromedriver-$CHROME_DRIVER_VERSION \
- && ln -fs /opt/selenium/chromedriver-$CHROME_DRIVER_VERSION /usr/bin/chromedriver
-
-# Cache gradle for performance
-ENV GRADLE_USER_HOME /usr/local/maven_files
-WORKDIR /tmp/work
-ADD cache_dependencies.sh cache_dependencies.sh
-RUN chmod +x cache_dependencies.sh
-RUN ./cache_dependencies.sh && rm -rf /tmp/work
+ && ln -fs /opt/selenium/chromedriver-$CHROME_DRIVER_VERSION /usr/bin/chromedriver \
+ && ./cache_dependencies.sh \
+ && apt-get clean \
+ && rm -rf /var/lib/apt/lists/* \
+ && rm -rf /tmp/work
diff --git a/ci/docker/docker.list b/ci/docker/docker.list
index e719b64..fa0b4f0 100644
--- a/ci/docker/docker.list
+++ b/ci/docker/docker.list
@@ -14,4 +14,4 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-deb https://apt.dockerproject.org/repo debian-stretch main
+deb http://apt.dockerproject.org/repo debian-stretch main
--
To stop receiving notification emails like this one, please contact
abaker@apache.org.