Skip to content

Commit

Permalink
Update Dockerfile
Browse files Browse the repository at this point in the history
Rolled up 'actions-runner' and 'podman' versions.
  • Loading branch information
shakerg authored Jan 12, 2024
1 parent 63a3891 commit 251bfee
Showing 1 changed file with 6 additions and 7 deletions.
13 changes: 6 additions & 7 deletions openshift/builds/podman-custom-runner/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
FROM quay.io/podman/stable:v4.3.1
FROM --platform=linux/amd64 quay.io/podman/stable:v4.8.3

# Target architecture
ARG TARGETPLATFORM=linux/amd64

# GitHub runner arguments
ARG RUNNER_VERSION=2.299.1
ARG RUNNER_VERSION=2.311.0

# Other arguments
ARG DEBUG=false
Expand All @@ -23,10 +23,6 @@ RUN dnf install -y \
curl \
&& dnf clean all

# Removing kubectl - runner load via GitHub Actions instead
# RUN curl -LO "https://dl.k8s.io/release/$(curl -L -s https://dl.k8s.io/release/stable.txt)/bin/linux/amd64/kubectl" \
# && mv kubectl /usr/local/bin/

# Runner download supports amd64 as x64
RUN test -n "$TARGETPLATFORM" || (echo "TARGETPLATFORM must be set" && false)
RUN ARCH=$(echo ${TARGETPLATFORM} | cut -d / -f2) \
Expand All @@ -42,9 +38,12 @@ RUN ARCH=$(echo ${TARGETPLATFORM} | cut -d / -f2) \
&& dnf clean all

COPY logger.sh /opt/bash-utils/logger.sh
# Adding private CA
# COPY ca.crt /etc/pki/ca-trust/source/anchors/ca.crt
COPY entrypoint.sh /usr/local/bin/

RUN chmod +x /usr/local/bin/entrypoint.sh \
RUN update-ca-trust \
&& chmod +x /usr/local/bin/entrypoint.sh \
&& sed -i 's|\[machine\]|\#\[machine\]|g' /usr/share/containers/containers.conf \
&& sed -i 's|\#ignore_chown_errors = "false"|ignore_chown_errors = "true"|g' /etc/containers/storage.conf

Expand Down

0 comments on commit 251bfee

Please sign in to comment.