summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNora <nora.widdecke@tu-bs.de>2019-05-23 23:39:20 +0200
committerNora <nora.widdecke@tu-bs.de>2019-05-23 23:39:20 +0200
commitf5e2be75e70b6e01fa6fd2a7771ce7f2eccd28af (patch)
tree9603d7814fe2318d21ab34ca48ceb6f6fae2ca0f
parent1f3ecb675fe0e3635a6a63cd1341e9fd5b8b82a0 (diff)
images now with 100% more rustup
-rw-r--r--.circleci/config.yml4
-rw-r--r--.circleci/images/rust-libical3-kcov/Dockerfile2
-rw-r--r--.circleci/images/rust-libical3/Dockerfile1
3 files changed, 4 insertions, 3 deletions
diff --git a/.circleci/config.yml b/.circleci/config.yml
index 08377e6..867b190 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -2,7 +2,7 @@ version: 2
jobs:
test:
docker:
- - image: puzzlewolf/rust-libical3:0.6
+ - image: puzzlewolf/rust-libical3:0.7
working_directory: /mnt/crate
steps:
- checkout
@@ -42,7 +42,7 @@ jobs:
- target/debug/*
coverage:
docker:
- - image: puzzlewolf/rust-libical3-kcov:0.6
+ - image: puzzlewolf/rust-libical3-kcov:0.7
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 3c1288c..d9e9bb4 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.6
+FROM puzzlewolf/rust-libical3:0.7
ARG KCOV_GIT_REF
diff --git a/.circleci/images/rust-libical3/Dockerfile b/.circleci/images/rust-libical3/Dockerfile
index 211cabe..ff4e1d9 100644
--- a/.circleci/images/rust-libical3/Dockerfile
+++ b/.circleci/images/rust-libical3/Dockerfile
@@ -22,6 +22,7 @@ RUN apt-get update && \
# cd ../.. && rm -rf kcov-$KCOV_VERSION
#RUN curl https://sh.rustup.rs -sSf | sh -s -- -y
+RUN curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y
ENV PATH "$PATH:/root/.cargo/bin"
#ENV RUSTFLAGS "-C link-dead-code"