From 422cd11b5a3b5af0327db68849b79aeeb5bd9dc2 Mon Sep 17 00:00:00 2001 From: Ted Hess Date: Tue, 18 Dec 2018 16:24:04 -0500 Subject: [PATCH] CircleCI: Add bzr to Docker image. Update to v1.0.2 Signed-off-by: Ted Hess --- .circleci/Dockerfile | 7 +++++++ .circleci/config.yml | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/.circleci/Dockerfile b/.circleci/Dockerfile index b619ffd74c..b3575b2066 100644 --- a/.circleci/Dockerfile +++ b/.circleci/Dockerfile @@ -1,5 +1,11 @@ FROM debian:9 + +# Configuration version history +# v1.0 - Initial version by Etienne Champetier +# v1.0.1 - Run as non-root, add unzip, xz-utils +# v1.0.2 - Add bzr + RUN apt update && apt install -y \ build-essential \ curl \ @@ -11,6 +17,7 @@ libncurses5-dev \ libssl-dev \ python \ subversion \ +bzr \ time \ wget \ zlib1g-dev \ diff --git a/.circleci/config.yml b/.circleci/config.yml index 87a8cf8ef3..8fc53ba682 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -2,7 +2,7 @@ version: 2.0 jobs: build: docker: - - image: docker.io/openwrtorg/packages-cci:v1.0.1 + - image: docker.io/openwrtorg/packages-cci:v1.0.2 environment: - SDK_HOST: "downloads.openwrt.org" - SDK_PATH: "snapshots/targets/ar71xx/generic" -- 2.30.2