From 377dfe073ed4a9983a54e1c8a7fed654ec85104b Mon Sep 17 00:00:00 2001 From: Erki Date: Sun, 23 Jan 2022 16:23:50 +0200 Subject: [PATCH] Re-enable caching for faster building --- .drone.yml | 4 ++-- cpp-ubuntu.Dockerfile | 3 +-- jenkins-ubuntu.Dockerfile | 3 +-- 3 files changed, 4 insertions(+), 6 deletions(-) diff --git a/.drone.yml b/.drone.yml index 533f76c..f928f8b 100644 --- a/.drone.yml +++ b/.drone.yml @@ -6,7 +6,7 @@ steps: - name: build cpp-ubuntu image: docker commands: - - docker build --no-cache -t erki/cpp-ubuntu:latest - < cpp-ubuntu.Dockerfile + - docker build -t erki/cpp-ubuntu:latest - < cpp-ubuntu.Dockerfile volumes: - name: docker_socket path: /var/run/docker.sock @@ -14,7 +14,7 @@ steps: - name: build jenkins-ubuntu image: docker commands: - - docker build --no-cache -t erki/jenkins-ubuntu:latest - < jenkins-ubuntu.Dockerfile + - docker build -t erki/jenkins-ubuntu:latest - < jenkins-ubuntu.Dockerfile volumes: - name: docker_socket path: /var/run/docker.sock diff --git a/cpp-ubuntu.Dockerfile b/cpp-ubuntu.Dockerfile index 0f0c30d..bc5d0db 100644 --- a/cpp-ubuntu.Dockerfile +++ b/cpp-ubuntu.Dockerfile @@ -2,8 +2,7 @@ FROM ubuntu:20.04 ENV DEBIAN_FRONTEND noninteractive -RUN apt-get update -y -RUN apt-get install -y --no-install-recommends git build-essential cmake ninja-build python3 python3-pip +RUN apt-get update -y && apt-get install -y --no-install-recommends git build-essential cmake ninja-build python3 python3-pip RUN pip3 install --upgrade conan==1.42.1 RUN conan profile new default --detect RUN conan profile update settings.compiler.libcxx=libstdc++11 default diff --git a/jenkins-ubuntu.Dockerfile b/jenkins-ubuntu.Dockerfile index 393336f..988a8c9 100644 --- a/jenkins-ubuntu.Dockerfile +++ b/jenkins-ubuntu.Dockerfile @@ -2,5 +2,4 @@ FROM ubuntu:focal ENV DEBIAN_FRONTEND noninteractive -RUN apt-get update -y -RUN apt-get install -y --no-install-recommends ssh git build-essential cmake ninja-build python3 python3-pip default-jre +RUN apt-get update -y && apt-get install -y --no-install-recommends ssh git build-essential cmake ninja-build python3 python3-pip default-jre