Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Update base and buildah images #29

Open
wants to merge 2 commits into
base: main
Choose a base branch
from
Open

Update base and buildah images #29

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e971f5e
Add - podman-compose / Fix - podman-login
Ronan-WeScale Jul 7, 2023
635ca0b
Add - python-pip
Ronan-WeScale Jul 7, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion base/Containerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
10 changes: 9 additions & 1 deletion buildah/Containerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 - &&\
Expand All @@ -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 && \
Expand Down