From 2b9a02818127c49757aa6fab4985b65c40946e1f Mon Sep 17 00:00:00 2001
From: Adar Nimrod <nimrod@shore.co.il>
Date: Tue, 20 Dec 2022 22:45:29 +0200
Subject: [PATCH] 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.
---
images/bats/Dockerfile | 3 ++-
images/docker/Dockerfile | 3 +++
2 files changed, 5 insertions(+), 1 deletion(-)
diff --git a/images/bats/Dockerfile b/images/bats/Dockerfile
index 1ac5f28..de00fb1 100644
--- a/images/bats/Dockerfile
+++ b/images/bats/Dockerfile
@@ -1,4 +1,4 @@
-FROM registry.hub.docker.com/library/alpine:3.14
+FROM registry.hub.docker.com/library/alpine:3.17
# hadolint ignore=DL3018
RUN apk add --update --no-cache \
bats \
@@ -7,5 +7,6 @@ RUN apk add --update --no-cache \
git \
openssh-client-default \
openssl \
+ podman \
&& \
rm -rf /var/cache/apk/* /tmp/* /var/tmp/*
diff --git a/images/docker/Dockerfile b/images/docker/Dockerfile
index e1c2bf8..8b3ed2f 100644
--- a/images/docker/Dockerfile
+++ b/images/docker/Dockerfile
@@ -1,10 +1,13 @@
FROM docker:20.10
# hadolint ignore=DL3018
RUN apk add --update-cache --no-cache \
+ buildah \
docker-compose \
docker-py \
+ podman \
py3-dotenv \
py3-pip \
+ skopeo \
&& \
python3 -m pip install --no-cache-dir --progress-bar=off deepclean && \
rm -rf /root/.cache /tmp/* /var/tmp/*
--
GitLab