diff options
| author | Erik Skultety <eskultet@redhat.com> | 2021-02-09 11:33:57 +0100 |
|---|---|---|
| committer | Daniel P. Berrangé <dan-gitlab@berrange.com> | 2021-02-19 15:26:38 +0000 |
| commit | 3d45ab0546e5f82b496cb2dd3b6e9f6326d39a3e (patch) | |
| tree | 95d723ca6c96e0f10e523169767b02db1e700585 /containers | |
| parent | 8194ed37d28b9ea35f7d751771a06e8272e583e4 (diff) | |
| download | libvirt-ci-3d45ab0546e5f82b496cb2dd3b6e9f6326d39a3e.zip libvirt-ci-3d45ab0546e5f82b496cb2dd3b6e9f6326d39a3e.tar.gz libvirt-ci-3d45ab0546e5f82b496cb2dd3b6e9f6326d39a3e.tar.bz2 | |
containers: Convert the Docker sanity checker images to Alpine
Alpine is a much smaller image and for the sake of consistency we can
pull <language>:<major>.<minor>-alpine for all of our sanity checker
scripts.
Signed-off-by: Erik Skultety <eskultet@redhat.com>
Diffstat (limited to 'containers')
| -rw-r--r-- | containers/cargo-fmt/Dockerfile | 9 | ||||
| -rw-r--r-- | containers/check-dco/Dockerfile | 5 | ||||
| -rw-r--r-- | containers/cirrus-run/Dockerfile | 5 | ||||
| -rw-r--r-- | containers/go-fmt/Dockerfile | 8 |
4 files changed, 7 insertions, 20 deletions
diff --git a/containers/cargo-fmt/Dockerfile b/containers/cargo-fmt/Dockerfile index 66621eb..0472b08 100644 --- a/containers/cargo-fmt/Dockerfile +++ b/containers/cargo-fmt/Dockerfile @@ -1,10 +1,5 @@ -FROM rust:1.43 +FROM docker.io/library/rust:1.49-alpine -RUN export DEBIAN_FRONTEND=noninteractive && \ - apt-get update && \ - apt-get install --no-install-recommends -y \ - diffstat && \ - apt-get autoclean -y && \ - rustup component add rustfmt +RUN rustup component add rustfmt COPY cargo-fmt.sh /cargo-fmt diff --git a/containers/check-dco/Dockerfile b/containers/check-dco/Dockerfile index 366f72b..5e4b630 100644 --- a/containers/check-dco/Dockerfile +++ b/containers/check-dco/Dockerfile @@ -1,6 +1,5 @@ -FROM centos:8 +FROM docker.io/library/python:3.9-alpine -RUN dnf -y install python3 git && \ - dnf -y clean all +RUN apk add git COPY check-dco.py /check-dco diff --git a/containers/cirrus-run/Dockerfile b/containers/cirrus-run/Dockerfile index d1c0782..19e86ac 100644 --- a/containers/cirrus-run/Dockerfile +++ b/containers/cirrus-run/Dockerfile @@ -1,4 +1,3 @@ -FROM centos:8 +FROM docker.io/library/python:3.9-alpine -RUN dnf install -y python3 && \ - pip3 install cirrus-run==0.3.0 +RUN pip3 install cirrus-run==0.3.0 diff --git a/containers/go-fmt/Dockerfile b/containers/go-fmt/Dockerfile index 9079fea..3f027a3 100644 --- a/containers/go-fmt/Dockerfile +++ b/containers/go-fmt/Dockerfile @@ -1,9 +1,3 @@ -FROM golang:1.14 - -RUN export DEBIAN_FRONTEND=noninteractive && \ - apt-get update && \ - apt-get install --no-install-recommends -y \ - diffstat && \ - apt-get autoclean -y +FROM docker.io/library/golang:1.15-alpine COPY go-fmt.sh /go-fmt |