From e971f5e1df07edfed299d79f17871a3175660a3d Mon Sep 17 00:00:00 2001
From: Ronan-WeScale <ronan.ducamp@wescale.fr>
Date: Fri, 7 Jul 2023 16:35:36 +0200
Subject: [PATCH 1/2] Add - podman-compose / Fix - podman-login

---
 buildah/Containerfile | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/buildah/Containerfile b/buildah/Containerfile
index 0fbc1e9..d214412 100644
--- a/buildah/Containerfile
+++ b/buildah/Containerfile
@@ -9,10 +9,12 @@ USER root
 # https://github.com/containers/buildah/issues/3053
 
 RUN dnf -y update && \
-    dnf -y install xz slirp4netns buildah podman fuse-overlayfs shadow-utils --exclude container-selinux && \
+    dnf -y install xz slirp4netns buildah podman fuse-overlayfs shadow-utils python3-pip --exclude container-selinux && \
     dnf -y reinstall shadow-utils && \
     dnf clean all
 
+RUN pip3 install podman-compose
+
 ARG OC_VERSION=4.7.4
 RUN curl -sSLf https://mirror.openshift.com/pub/openshift-v4/x86_64/clients/ocp/${OC_VERSION}/openshift-client-linux.tar.gz \
     | tar --exclude=README.md -xzvf - &&\
@@ -27,6 +29,12 @@ RUN chgrp -R 0 /etc/containers/ && \
     chmod -R a+r /etc/containers/ && \
     chmod -R g+w /etc/containers/
 
+# podman-login
+# https://github.com/redhat-actions/podman-login/issues/18
+RUN mkdir -vp /home/$USERNAME/.docker && \
+    echo "{ \"auths\": {} }" > /home/$USERNAME/.docker/config.json && \
+    chown -Rv ${USERNAME} /home/$USERNAME/.docker
+
 # Use VFS since fuse does not work
 # https://github.com/containers/buildah/blob/master/vendor/github.com/containers/storage/storage.conf
 RUN mkdir -vp /home/${USERNAME}/.config/containers && \

From 635ca0bbf47a45ccffabb71d25ea0c26e0c6741e Mon Sep 17 00:00:00 2001
From: Ronan-WeScale <ronan.ducamp@wescale.fr>
Date: Fri, 7 Jul 2023 16:36:40 +0200
Subject: [PATCH 2/2] Add - python-pip

---
 base/Containerfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/base/Containerfile b/base/Containerfile
index f9b1795..480b8d7 100644
--- a/base/Containerfile
+++ b/base/Containerfile
@@ -3,7 +3,7 @@ FROM fedora:35
 # Adapted from https://github.com/bbrowning/github-runner/blob/master/Dockerfile
 RUN dnf -y upgrade --security && \
     dnf -y --setopt=skip_missing_names_on_install=False install \
-    curl git jq hostname procps findutils which openssl && \
+    curl git jq hostname procps findutils which openssl python3-pip && \
     dnf clean all
 
 # The UID env var should be used in child Containerfile.