Commit 2b9a0281 authored by nimrod's avatar nimrod
Browse files

Add Podman as a Docker replacement. 

Add Podman, Buildah and Skopeo as replacements for Docker (not removing
Docker yet). Also, update the Bats image to the latest Alpine release.
parent 7a3faec9

images/bats/Dockerfile

+2 −1
Original line number Original line Diff line number Diff line 
FROM registry.hub.docker.com/library/alpine:3.14

FROM registry.hub.docker.com/library/alpine:3.17

# hadolint ignore=DL3018

# hadolint ignore=DL3018

RUN apk add --update --no-cache \

RUN apk add --update --no-cache \

        bats \

        bats \
@@ -7,5 +7,6 @@ RUN apk add --update --no-cache \ 
        git \

        git \

        openssh-client-default \

        openssh-client-default \

        openssl \

        openssl \

        podman \

    && \

    && \

    rm -rf /var/cache/apk/* /tmp/* /var/tmp/*
 
    rm -rf /var/cache/apk/* /tmp/* /var/tmp/*

images/docker/Dockerfile

+3 −0
Original line number Original line Diff line number Diff line 
FROM docker:20.10

FROM docker:20.10

# hadolint ignore=DL3018

# hadolint ignore=DL3018

RUN apk add --update-cache --no-cache \

RUN apk add --update-cache --no-cache \

        buildah \

        docker-compose \

        docker-compose \

        docker-py \

        docker-py \

        podman \

        py3-dotenv \

        py3-dotenv \

        py3-pip \

        py3-pip \

        skopeo \

    && \

    && \

    python3 -m pip install --no-cache-dir --progress-bar=off deepclean && \

    python3 -m pip install --no-cache-dir --progress-bar=off deepclean && \

    rm -rf /root/.cache /tmp/* /var/tmp/*

    rm -rf /root/.cache /tmp/* /var/tmp/*