From b33b96ba73e6e9c76992d18ee70160cb472d01bf Mon Sep 17 00:00:00 2001 From: Scott Larkin Date: Thu, 12 Sep 2019 11:34:36 -0400 Subject: [PATCH 1/2] Favor volume mounting over file system mounting We were running into some issues getting this to build on CI. While the image built fine locally, on CI, we'd hit an error at the step in the docker file `Release.plan` where we tried to `ADD .local/bin/codeclimate-shellcheck /home/app/bin/engine`. Will did some digging and was able to determine that we likely needed to volume mount instead. Co-authored-by: Will Fleming --- Makefile | 19 ++++++++++++++----- 1 file changed, 14 insertions(+), 5 deletions(-) diff --git a/Makefile b/Makefile index 868b68f..2403d97 100644 --- a/Makefile +++ b/Makefile @@ -7,24 +7,33 @@ data/env.yml: git submodule update ./data/prepare.rb +data_volume: + (docker volume ls | grep "codeclimate_shellcheck_data") || docker volume create "codeclimate_shellcheck_data" + build: docker build \ --tag $(IMAGE_NAME)-build \ --file $(PWD)/docker/Build.plan . -.local/bin/codeclimate-shellcheck: build +.local/bin/codeclimate-shellcheck: build data_volume docker run --rm \ - --volume $(PWD)/.local/bin:/root/.local/bin \ + --volume codeclimate_shellcheck_data:/root/.local/bin \ --volume $(PWD)/.local/.stack:/root/.stack \ --volume $(PWD)/.local/.stack-work:/home/app/.stack-work \ $(IMAGE_NAME)-build stack install -compress: .local/bin/codeclimate-shellcheck +compress: .local/bin/codeclimate-shellcheck data_volume docker run \ - --volume $(PWD)/.local/bin:/data \ + --volume codeclimate_shellcheck_data:/data \ lalyos/upx codeclimate-shellcheck -image: .local/bin/codeclimate-shellcheck data/env.yml +image: .local/bin/codeclimate-shellcheck data/env.yml data_volume + mkdir -p .local/bin + docker run --volume codeclimate_shellcheck_data:/data \ + --name codeclimate_shellcheck_build_helper \ + $(IMAGE_NAME)-build true + docker cp codeclimate_shellcheck_build_helper:/data/codeclimate-shellcheck .local/bin + docker rm codeclimate_shellcheck_build_helper docker build \ --tag $(IMAGE_NAME) \ --file $(PWD)/docker/Release.plan . From ec380d87c269c345e767c591a609d953af582d6c Mon Sep 17 00:00:00 2001 From: Scott Larkin Date: Fri, 13 Sep 2019 14:45:06 -0400 Subject: [PATCH 2/2] Revert "Favor volume mounting over file system mounting" --- Makefile | 19 +++++-------------- 1 file changed, 5 insertions(+), 14 deletions(-) diff --git a/Makefile b/Makefile index 2403d97..868b68f 100644 --- a/Makefile +++ b/Makefile @@ -7,33 +7,24 @@ data/env.yml: git submodule update ./data/prepare.rb -data_volume: - (docker volume ls | grep "codeclimate_shellcheck_data") || docker volume create "codeclimate_shellcheck_data" - build: docker build \ --tag $(IMAGE_NAME)-build \ --file $(PWD)/docker/Build.plan . -.local/bin/codeclimate-shellcheck: build data_volume +.local/bin/codeclimate-shellcheck: build docker run --rm \ - --volume codeclimate_shellcheck_data:/root/.local/bin \ + --volume $(PWD)/.local/bin:/root/.local/bin \ --volume $(PWD)/.local/.stack:/root/.stack \ --volume $(PWD)/.local/.stack-work:/home/app/.stack-work \ $(IMAGE_NAME)-build stack install -compress: .local/bin/codeclimate-shellcheck data_volume +compress: .local/bin/codeclimate-shellcheck docker run \ - --volume codeclimate_shellcheck_data:/data \ + --volume $(PWD)/.local/bin:/data \ lalyos/upx codeclimate-shellcheck -image: .local/bin/codeclimate-shellcheck data/env.yml data_volume - mkdir -p .local/bin - docker run --volume codeclimate_shellcheck_data:/data \ - --name codeclimate_shellcheck_build_helper \ - $(IMAGE_NAME)-build true - docker cp codeclimate_shellcheck_build_helper:/data/codeclimate-shellcheck .local/bin - docker rm codeclimate_shellcheck_build_helper +image: .local/bin/codeclimate-shellcheck data/env.yml docker build \ --tag $(IMAGE_NAME) \ --file $(PWD)/docker/Release.plan .