From 39cbcb41d3e79d2bc896f3a3e198a9afc990cf0a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Johannes=20M=C3=BCller?= Date: Tue, 28 Jan 2020 23:12:34 +0100 Subject: [PATCH] Use alpine image from crystallang --- .circleci/config.yml | 4 ++-- bin/ci | 7 +++++-- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index c431efab335c..a85e0e9f49f7 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -67,9 +67,9 @@ jobs: environment: <<: *env TRAVIS_OS_NAME: linux - ARCH: x86_64 + ARCH: x86_64-musl ARCH_CMD: linux64 - DOCKER_TEST_IMAGE: jrei/crystal-alpine:latest + DOCKER_TEST_PREFIX: crystallang/crystal:ci-test-dev # TODO: Remove after 0.33.0 steps: *ci_steps test_darwin: diff --git a/bin/ci b/bin/ci index ebd6fed7c1dd..328dd98569fc 100755 --- a/bin/ci +++ b/bin/ci @@ -146,10 +146,13 @@ with_build_env() { case $ARCH in x86_64) - export DOCKER_TEST_IMAGE="${DOCKER_TEST_IMAGE:=$DOCKER_TEST_PREFIX-build}" + export DOCKER_TEST_IMAGE="$DOCKER_TEST_PREFIX-build" + ;; + x86_64-musl) + export DOCKER_TEST_IMAGE="$DOCKER_TEST_PREFIX-alpine-build" ;; i386) - export DOCKER_TEST_IMAGE="${DOCKER_TEST_IMAGE:=$DOCKER_TEST_PREFIX-i386-build}" + export DOCKER_TEST_IMAGE="$DOCKER_TEST_PREFIX-i386-build" ;; esac