summaryrefslogtreecommitdiff
path: root/contrib/podmanimage/upstream
diff options
context:
space:
mode:
authorErik Sjölund <erik.sjolund@gmail.com>2022-01-15 20:57:59 +0100
committerErik Sjölund <erik.sjolund@gmail.com>2022-01-15 22:08:42 +0100
commit3c2a5947c243ccbc611c1846c685b73de4462242 (patch)
treea58b961c64c2bb1e486e30f58de8ab1b048f80e6 /contrib/podmanimage/upstream
parent3c9e41bb5393e0a857d8755bb50345544cc31b50 (diff)
downloadpodman-3c2a5947c243ccbc611c1846c685b73de4462242.tar.gz
podman-3c2a5947c243ccbc611c1846c685b73de4462242.tar.bz2
podman-3c2a5947c243ccbc611c1846c685b73de4462242.zip
fix default branch links
* Replace https://github.com/containers/podman/blob/master with https://github.com/containers/podman/blob/main to match the new default branch "main". Previously the default branch was "master". This is the only occurence found in the code. * Replace https://raw.githubusercontent.com/containers/libpod/master with https://raw.githubusercontent.com/containers/podman/main Signed-off-by: Erik Sjölund <erik.sjolund@gmail.com>
Diffstat (limited to 'contrib/podmanimage/upstream')
-rw-r--r--contrib/podmanimage/upstream/Dockerfile6
1 files changed, 3 insertions, 3 deletions
diff --git a/contrib/podmanimage/upstream/Dockerfile b/contrib/podmanimage/upstream/Dockerfile
index 864227f89..4b44c74c2 100644
--- a/contrib/podmanimage/upstream/Dockerfile
+++ b/contrib/podmanimage/upstream/Dockerfile
@@ -58,7 +58,7 @@ RUN yum -y update; rpm --restore shadow-utils 2>/dev/null; yum -y install --exc
mkdir -p /usr/libexec/cni; \
\cp -fR bin/* /usr/libexec/cni; \
mkdir -p /etc/cni/net.d; \
- curl -qsSL https://raw.githubusercontent.com/containers/libpod/master/cni/87-podman-bridge.conflist | tee /etc/cni/net.d/99-loopback.conf; \
+ curl -qsSL https://raw.githubusercontent.com/containers/podman/main/cni/87-podman-bridge.conflist | tee /etc/cni/net.d/99-loopback.conf; \
mkdir -p /usr/share/containers; \
rm -rf /root/podman/*; \
yum -y remove git golang go-md2man make; \
@@ -68,8 +68,8 @@ RUN useradd podman; \
echo podman:10000:5000 > /etc/subuid; \
echo podman:10000:5000 > /etc/subgid;
-ADD https://raw.githubusercontent.com/containers/libpod/master/contrib/podmanimage/stable/containers.conf /etc/containers/containers.conf
-ADD https://raw.githubusercontent.com/containers/libpod/master/contrib/podmanimage/stable/podman-containers.conf /home/podman/.config/containers/containers.conf
+ADD https://raw.githubusercontent.com/containers/podman/main/contrib/podmanimage/stable/containers.conf /etc/containers/containers.conf
+ADD https://raw.githubusercontent.com/containers/podman/main/contrib/podmanimage/stable/podman-containers.conf /home/podman/.config/containers/containers.conf
RUN mkdir -p /home/podman/.local/share/containers; chown podman:podman -R /home/podman