From f2b986870b5180931297d68483f5647dedf16a3e Mon Sep 17 00:00:00 2001 From: Ben Johnson Date: Tue, 8 Oct 2019 20:01:53 -0400 Subject: [PATCH 1/3] chore(operations): Add git to musl build image Signed-off-by: Ben Johnson --- .circleci/config.yml | 3 +++ .../builder-x86_64-unknown-linux-musl/Dockerfile | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 3889c10f456fc..1528f08aebd03 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -175,6 +175,9 @@ jobs: - image: timberiodev/vector-builder-x86_64-unknown-linux-musl:latest resource_class: xlarge steps: + - run: + name: Install Git + command: apt-get install libssl-dev git - checkout - run: name: Build archive diff --git a/scripts/ci-docker-images/builder-x86_64-unknown-linux-musl/Dockerfile b/scripts/ci-docker-images/builder-x86_64-unknown-linux-musl/Dockerfile index b2816c795bab3..12c9df0c8acfa 100644 --- a/scripts/ci-docker-images/builder-x86_64-unknown-linux-musl/Dockerfile +++ b/scripts/ci-docker-images/builder-x86_64-unknown-linux-musl/Dockerfile @@ -274,7 +274,7 @@ ARG LIBS_PREFIX COPY --from=libs-builder $LIBS_PREFIX $LIBS_PREFIX ENV PATH="$LIBS_PREFIX/bin:$PATH" -RUN apt-get update && apt-get install -y build-essential pkg-config +RUN apt-get update && apt-get install -y build-essential pkg-config libssl-dev git # Because the system GCC and binutils are shadowed by aliases, we need to # instruct Cargo and cc crate to use GCC on the host system. They are used to From 87a07580797f8eaa1d6e6cc74c5e6e078090dc77 Mon Sep 17 00:00:00 2001 From: Ben Johnson Date: Tue, 8 Oct 2019 20:03:20 -0400 Subject: [PATCH 2/3] Pass -y Signed-off-by: Ben Johnson --- .circleci/config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 1528f08aebd03..74b71a0cd89ef 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -177,7 +177,7 @@ jobs: steps: - run: name: Install Git - command: apt-get install libssl-dev git + command: apt-get install -y --no-install-recommends libssl-dev git - checkout - run: name: Build archive From 3d6595aef4e7d895af5b27ee54b40bfc703f5010 Mon Sep 17 00:00:00 2001 From: Ben Johnson Date: Tue, 8 Oct 2019 23:13:05 -0400 Subject: [PATCH 3/3] remove CI package install step Signed-off-by: Ben Johnson --- .circleci/config.yml | 3 --- 1 file changed, 3 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 74b71a0cd89ef..3889c10f456fc 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -175,9 +175,6 @@ jobs: - image: timberiodev/vector-builder-x86_64-unknown-linux-musl:latest resource_class: xlarge steps: - - run: - name: Install Git - command: apt-get install -y --no-install-recommends libssl-dev git - checkout - run: name: Build archive