Cleanup CI Dockerfile
This change separates the Dockerfile `RUN` directives into distinct
commands rather than running everything in a single `RUN` directive.
This also changes the MariaDB installation to use the recommended
mirrors in the official installation documentation for Debian Jessie.
@@ -7,23 +7,30 @@ ENV HOME /
ENV CLOUDSDK_PYTHON_SITEPACKAGES 1
ENV PATH /google-cloud-sdk/bin:$PATH
-RUN apt-key adv --recv-keys --keyserver hkp://keyserver.ubuntu.com:80 0xcbcb082a1bb943db && \
- echo 'deb [arch=amd64,i386] http://nyc2.mirrors.digitalocean.com/mariadb/repo/10.1/debian jessie main' >> /etc/apt/sources.list && \
- echo 'deb-src http://nyc2.mirrors.digitalocean.com/mariadb/repo/10.1/debian jessie main' >> /etc/apt/sources.list && \
- debconf-set-selections << 'mariadb-server-10.1 mysql-server/root_password password root' && \
- debconf-set-selections << 'mariadb-server-10.1 mysql-server/root_password_again password root' && \
- echo 'deb http://httpredir.debian.org/debian testing main' >> /etc/apt/sources.list && \
+# Install MariaDB
+RUN apt-get update && \
+ apt-get -y install software-properties-common && \
+ apt-key adv --recv-keys --keyserver keyserver.ubuntu.com 0xcbcb082a1bb943db && \
+ add-apt-repository 'deb [arch=amd64,i386,ppc64el] http://mirror.nodesdirect.com/mariadb/repo/10.1/debian jessie main' && \
apt-get update && \
- apt-get install -y --no-install-recommends mariadb-server unzip libgit2-dev pkg-config openjdk-8-jre-headless && \
+ apt-get -y install mariadb-server
+
+# Install Common Dependencies
+RUN echo 'deb http://httpredir.debian.org/debian testing main' >> /etc/apt/sources.list && \
+ apt-get update && \
+ apt-get install -y unzip libgit2-dev pkg-config openjdk-8-jre-headless && \
apt-get upgrade -y -qq && \
- wget https://s3.amazonaws.com/bosh-cli-artifacts/bosh-cli-0.0.84-linux-amd64 && \
- mv bosh-cli-0.0.84-linux-amd64 /usr/local/bin/bosh-cli && \
- chmod +x /usr/local/bin/bosh-cli && \
- apt-get -y clean && apt-get -y autoremove --purge && \
- rm -rf /var/lib/apt/lists/*
+ apt-get -y clean && \
+ apt-get -y autoremove --purge
-# gcloud
+# Install BOSH CLI
+RUN wget https://s3.amazonaws.com/bosh-cli-artifacts/bosh-cli-2.0.28-linux-amd64 && \
+ mv bosh-cli-2.0.28-linux-amd64 /usr/local/bin/bosh-cli && \
+ chmod +x /usr/local/bin/bosh-cli
+
+# Install GCloud CLI
WORKDIR /
+
RUN wget https://dl.google.com/dl/cloudsdk/channels/rapid/google-cloud-sdk.zip && \
unzip google-cloud-sdk.zip && \
rm google-cloud-sdk.zip && \
