From a1ef5e32055f7afbb0647fd0cd87078e6a4e00ec Mon Sep 17 00:00:00 2001 From: yuvipanda Date: Wed, 11 Jul 2018 13:08:36 -0700 Subject: [PATCH] [CI] Remove base image used for CI Not necessary, since we can just use different images for our jobs! <3 CircleCI --- .circleci/base-image/Dockerfile | 22 ---------------------- .circleci/base-image/README.rst | 16 ---------------- .circleci/base-image/build.bash | 15 --------------- 3 files changed, 53 deletions(-) delete mode 100644 .circleci/base-image/Dockerfile delete mode 100644 .circleci/base-image/README.rst delete mode 100755 .circleci/base-image/build.bash diff --git a/.circleci/base-image/Dockerfile b/.circleci/base-image/Dockerfile deleted file mode 100644 index 3b096d1..0000000 --- a/.circleci/base-image/Dockerfile +++ /dev/null @@ -1,22 +0,0 @@ -FROM continuumio/miniconda3:4.5.4 - - -RUN apt-get update --yes - -RUN apt-get install --yes --no-install-recommends \ - apt-transport-https \ - ca-certificates \ - curl \ - gnupg2 \ - software-properties-common - -RUN curl -fsSL https://download.docker.com/linux/debian/gpg | apt-key add - - -RUN add-apt-repository \ - "deb [arch=amd64] https://download.docker.com/linux/debian \ - $(lsb_release -cs) \ - stable" - -RUN apt-get update --yes - -RUN apt-get install --yes docker-ce diff --git a/.circleci/base-image/README.rst b/.circleci/base-image/README.rst deleted file mode 100644 index 14d4a34..0000000 --- a/.circleci/base-image/README.rst +++ /dev/null @@ -1,16 +0,0 @@ -======================== -TLJH CircleCI Base Image -======================== - -Miniconda should be installed in the base CircleCI image for our unit tests. -Docker CE should be installed in the base CircleCI image for our integration tests. - -This image contains both, so we do not have to build it every single time. - -Updating the image -================== - -1. Make changes to the ``Dockerfile`` & commit it. -2. Run ``./build.bash`` from this directory. It'll build, tag & push the image with - the hash of the last commit that touched this directory. -3. Use the new image tag in the ``.circleci/config.yml`` file. diff --git a/.circleci/base-image/build.bash b/.circleci/base-image/build.bash deleted file mode 100755 index baf1752..0000000 --- a/.circleci/base-image/build.bash +++ /dev/null @@ -1,15 +0,0 @@ -#!/bin/bash -set -euo pipefail - -# Very simple script to build and push images -# Should be replaced by chartpress or similar at some point -# Uses google container image builder for simplicity -IMAGE="jupyterhub/tljh-circleci-base-image" -TAG=$(git log -n1 --pretty="%h" .) -IMAGE_SPEC="${IMAGE}:${TAG}" - - -echo "Building and pushing ${IMAGE_SPEC}" -docker build -t ${IMAGE_SPEC} . -docker push ${IMAGE_SPEC} -echo "Built and pushed ${IMAGE_SPEC}"