From 1407e2330b34b3be2f392f1c46c5905e3d692d7e Mon Sep 17 00:00:00 2001 From: Radon Rosborough Date: Wed, 7 Oct 2020 18:39:20 -0700 Subject: [PATCH] Update CircleCI, fix libc6:i386 install error --- .circleci/config.yml | 16 ++++++++++++++++ scripts/docker-install-phase1.bash | 2 +- 2 files changed, 17 insertions(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 915887a..c3cc57e 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -1,5 +1,15 @@ version: 2 jobs: + build: + docker: + - image: alpine + steps: + - checkout + - setup_remote_docker + - run: >- + apk add --no-cache --no-progress + bash docker make + - run: make image-prod build_and_deploy: docker: - image: alpine @@ -17,6 +27,12 @@ workflows: version: 2 ci: jobs: + - build: + filters: + branches: + ignore: master + tags: + ignore: /.*/ - build_and_deploy: filters: branches: diff --git a/scripts/docker-install-phase1.bash b/scripts/docker-install-phase1.bash index 285758a..7f090ca 100755 --- a/scripts/docker-install-phase1.bash +++ b/scripts/docker-install-phase1.bash @@ -9,7 +9,7 @@ dpkg --add-architecture i386 export DEBIAN_FRONTEND=noninteractive apt-get update -apt-get install -y apt-transport-https curl gnupg lsb-release software-properties-common wget +apt-get install -y apt-transport-https curl gnupg libc6 libc6:i386 lsb-release software-properties-common wget rm -rf /var/lib/apt/lists/* ubuntu_ver="$(lsb_release -rs)"