diff options
| author | Nora <nora.widdecke@tu-bs.de> | 2019-05-23 22:51:08 +0200 |
|---|---|---|
| committer | Nora <nora.widdecke@tu-bs.de> | 2019-05-23 22:51:08 +0200 |
| commit | ee7b611d252816321a7f3df42896ba13b8584bb1 (patch) | |
| tree | 39f1b5b70aea3ede0142237b0f8ec0162345225a | |
| parent | 798215f387fb7dc4a7a792a99d5953eb87ab87e0 (diff) | |
use rustup in containers
| -rw-r--r-- | .circleci/config.yml | 4 | ||||
| -rw-r--r-- | .circleci/images/rust-libical3-kcov/Dockerfile | 4 | ||||
| -rw-r--r-- | .circleci/images/rust-libical3/Dockerfile | 4 |
3 files changed, 6 insertions, 6 deletions
diff --git a/.circleci/config.yml b/.circleci/config.yml index 8c680c2..68c8ae3 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -2,7 +2,7 @@ version: 2 jobs: test: docker: - - image: puzzlewolf/rust-libical3:0.4 + - image: puzzlewolf/rust-libical3:0.5 working_directory: /mnt/crate steps: - checkout @@ -42,7 +42,7 @@ jobs: - target/debug/* coverage: docker: - - image: puzzlewolf/rust-libical3-kcov:0.3 + - image: puzzlewolf/rust-libical3-kcov:0.5 entrypoint: /bin/bash working_directory: /mnt/crate steps: diff --git a/.circleci/images/rust-libical3-kcov/Dockerfile b/.circleci/images/rust-libical3-kcov/Dockerfile index cc1dd29..3a0e20f 100644 --- a/.circleci/images/rust-libical3-kcov/Dockerfile +++ b/.circleci/images/rust-libical3-kcov/Dockerfile @@ -1,5 +1,5 @@ #FROM debian:buster -FROM puzzlewolf/rust-libical3:0.3 +FROM puzzlewolf/rust-libical3:0.5 ARG KCOV_GIT_REF @@ -8,7 +8,7 @@ RUN apt-get update # is installed we do not repeat the whole image build. #RUN apt-get install -y --fix-missing pkg-config RUN apt-get install -y wget libcurl4-openssl-dev libelf-dev libdw-dev cmake cmake-data g++ binutils-dev \ - libiberty-dev + libiberty-dev #RUN apt-get install -y libical-dev ENV SRC_DIR=/home/kcov-src \ diff --git a/.circleci/images/rust-libical3/Dockerfile b/.circleci/images/rust-libical3/Dockerfile index b154164..480ace6 100644 --- a/.circleci/images/rust-libical3/Dockerfile +++ b/.circleci/images/rust-libical3/Dockerfile @@ -1,7 +1,7 @@ FROM buildpack-deps:buster # Some of the dependencies I need to build a few libraries, -# personalize to your needs. You can use multi-stage builds +# personalize to your needs. You can use multi-stage builds # to produce a lightweight image. #RUN apt-get update && \ # apt-get install -y curl file gcc g++ git make openssh-client \ @@ -10,7 +10,7 @@ FROM buildpack-deps:buster # xz-utils pkg-config python RUN apt-get update && \ - apt-get install -y rustc libical-dev clang + apt-get install -y libical-dev clang #ENV KCOV_VERSION 33 #RUN wget https://github.com/SimonKagstrom/kcov/archive/v$KCOV_VERSION.tar.gz && \ |