Skip to content

Commit

Permalink
Fix version 1 of the CI images
Browse files Browse the repository at this point in the history
* Add https transport for llvm ppa
* Fix setup of timezone (tzdata)
* Limit Danger gem to <8 (which requires ruby-2.4)
* Simplify versioning of images

Signed-off-by: Nicolas Bock <nicolasbock@gmail.com>
  • Loading branch information
nicolasbock committed May 6, 2020
1 parent 97d2e6c commit 8ff050f
Show file tree
Hide file tree
Showing 6 changed files with 17 additions and 6 deletions.
6 changes: 3 additions & 3 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ version: 2.1
jobs:
build-gcc-4_7-shared-serial-external: &build-template
docker:
- image: nicolasbock/bml-ci-build:1.0
- image: nicolasbock/bml-ci-build:1
environment:
OMP_NUM_THREADS: 4
CMAKE_BUILD_TYPE: Debug
Expand Down Expand Up @@ -230,7 +230,7 @@ jobs:
lint:
docker:
- image: nicolasbock/bml-ci-lint:1.0
- image: nicolasbock/bml-ci-lint:1
steps:
- checkout
- run: bundle install
Expand All @@ -239,7 +239,7 @@ jobs:

docs:
docker:
- image: nicolasbock/bml-ci-docs:1.0
- image: nicolasbock/bml-ci-docs:1
steps:
- checkout
- run: ./build.sh docs
Expand Down
2 changes: 1 addition & 1 deletion Gemfile
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# frozen_string_literal: true
source "https://rubygems.org"

gem "danger"
gem "danger", "<8"
gem "danger-commit_lint"
gem "danger-mention"
gem "danger-prose"
Expand Down
5 changes: 4 additions & 1 deletion ci-images/build/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,13 +1,16 @@
FROM ubuntu:xenial
RUN apt-get update
RUN apt-get install --assume-yes --no-install-recommends ca-certificates wget
RUN apt-get install --assume-yes --no-install-recommends apt-transport-https ca-certificates wget
COPY clang.list /etc/apt/sources.list.d
COPY cmake.list /etc/apt/sources.list.d
COPY toolchain.list /etc/apt/sources.list.d
RUN apt-key adv --keyserver keyserver.ubuntu.com --recv-keys 60C317803A41BA51845E371A1E9377A2BA9EF27F
RUN apt-key adv --keyserver keyserver.ubuntu.com --recv-keys DBA92F17B25AD78F9F2D9F713DEC686D130FF5E4
RUN wget -O - https://apt.llvm.org/llvm-snapshot.gpg.key | apt-key add -
RUN apt-get update
RUN ln -fs /usr/share/zoneinfo/UTC /etc/localtime
RUN apt-get install --assume-yes tzdata
RUN DEBIAN_FRONTEND=noninteractive dpkg-reconfigure --frontend noninteractive tzdata
RUN apt-get install --assume-yes --no-install-recommends apt-utils
RUN apt-get install --assume-yes --no-install-recommends build-essential
RUN apt-get install --assume-yes --no-install-recommends git-core openssh-client ca-certificates
Expand Down
4 changes: 4 additions & 0 deletions ci-images/docs/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,6 +1,10 @@
FROM ubuntu:focal
RUN apt-get update
RUN ln -fs /usr/share/zoneinfo/UTC /etc/localtime
RUN apt-get install --assume-yes tzdata
RUN DEBIAN_FRONTEND=noninteractive dpkg-reconfigure --frontend noninteractive tzdata
RUN apt-get install --assume-yes --no-install-recommends apt-utils
RUN apt-get install --assume-yes --no-install-recommends ca-certificates
RUN apt-get install --assume-yes --no-install-recommends build-essential
RUN apt-get install --assume-yes --no-install-recommends git-core openssh-client
RUN apt-get install --assume-yes --no-install-recommends cmake cmake-data libblas-dev liblapack-dev
Expand Down
4 changes: 4 additions & 0 deletions ci-images/lint/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,11 @@ FROM ubuntu:xenial
COPY emacs.list /etc/apt/sources.list.d
RUN apt-key adv --keyserver keyserver.ubuntu.com --recv-keys 873503A090750CDAEB0754D93FF0E01EEAAFC9CD
RUN apt-get update
RUN ln -fs /usr/share/zoneinfo/UTC /etc/localtime
RUN apt-get install --assume-yes tzdata
RUN DEBIAN_FRONTEND=noninteractive dpkg-reconfigure --frontend noninteractive tzdata
RUN apt-get install --assume-yes --no-install-recommends apt-utils
RUN apt-get install --assume-yes --no-install-recommends ca-certificates
RUN apt-get install --assume-yes --no-install-recommends git-core openssh-client
RUN apt-get install --assume-yes --no-install-recommends bundler
RUN apt-get install --assume-yes --no-install-recommends emacs26
Expand Down
2 changes: 1 addition & 1 deletion refresh-ci-images.sh
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
set -x

: ${IMAGE_TAG:=bml-ci}
: ${IMAGE_VERSION:=1.0}
: ${IMAGE_VERSION:=1}

for workflow in build lint docs; do
docker build --tag nicolasbock/${IMAGE_TAG}-${workflow}:${IMAGE_VERSION} ci-images/${workflow}
Expand Down

0 comments on commit 8ff050f

Please sign in to comment.