From 6f4aee32a7912b80448815abf201b9bf9f9c8b60 Mon Sep 17 00:00:00 2001 From: Tim Byrne Date: Thu, 21 Mar 2019 22:54:05 -0500 Subject: [PATCH] Use yadm/jekyll:latest image --- .travis.yml | 4 ++-- Makefile | 4 ++-- docker-compose.yml | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.travis.yml b/.travis.yml index 3165689..97f0176 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,12 +1,12 @@ --- env: - - IMAGE="jekyll/jekyll:3.8.5" + - IMAGE="yadm/jekyll:latest" language: minimal services: - docker before_install: - docker pull $IMAGE - - docker create -t --name yadm-website --entrypoint test/travis-ci $IMAGE + - docker create -t --name yadm-website --entrypoint test/validate $IMAGE - docker cp ./ yadm-website:/srv/jekyll script: - docker start yadm-website -a diff --git a/Makefile b/Makefile index 4db4ccd..4690546 100644 --- a/Makefile +++ b/Makefile @@ -13,7 +13,7 @@ usage: @echo 'TESTING' @echo @echo ' make test' - @echo ' - Perform tests done by travis-ci.' + @echo ' - Perform tests done by continuous integration.' @echo ' This target will:' @echo ' - Remove previously built data' @echo ' - Build the site' @@ -40,7 +40,7 @@ usage: .PHONY: test test: require-docker-compose clean - docker-compose run --rm website test/travis-ci + docker-compose run --rm website test/validate .PHONY: up up: require-docker-compose diff --git a/docker-compose.yml b/docker-compose.yml index bf9cd92..87cfc6e 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -2,7 +2,7 @@ version: '3' services: website: - image: jekyll/jekyll:3.8.5 + image: yadm/jekyll:latest ports: - 4000:4000 volumes: