erki/docker-images
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Re-enable caching for faster building
All checks were successful
continuous-integration/drone/push Build is passing
Details

Browse Source
This commit is contained in:
Erki 2022-01-23 16:23:50 +02:00
parent 3c480c76b5
commit 377dfe073e
3 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
.drone.yml
View File

@ -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

3
cpp-ubuntu.Dockerfile
View File

@ -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

3
jenkins-ubuntu.Dockerfile
View File

@ -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