From 0942070c31eccdafebf91e5323a01ea6cf79cf4f Mon Sep 17 00:00:00 2001
From: Tom Parker-Shemilt <palfrey@tevp.net>
Date: Mon, 26 Nov 2018 12:07:34 +0000
Subject: [PATCH] Remove hacky Travis workaround
---
ci/run-docker.sh | 6 ------
1 file changed, 6 deletions(-)
diff --git a/ci/run-docker.sh b/ci/run-docker.sh
index b1bd77fa..c656f590 100755
--- a/ci/run-docker.sh
+++ b/ci/run-docker.sh
@@ -8,12 +8,6 @@ set -ex
run() {
echo "Building docker container for target ${1}"
- # FIXME: Hacky workaround. Docker build seems to work better if we pull the base images first
- # Not using arrays/loops because it's not POSIX sh compatible
- docker pull ubuntu:16.04
- docker pull ubuntu:17.10
- docker pull ubuntu:18.04
-
# use -f so we can use ci/ as build context
docker build -t libc -f "ci/docker/${1}/Dockerfile" ci/
mkdir -p target
--
GitLab