containers-common-4:0.33.0-1
- update registries.conf and other files - source urls in update.sh Signed-off-by: Lokesh Mandvekar <lsm5@fedoraproject.org>
This commit is contained in:
Lokesh Mandvekar
parent
74debefad5
commit
fac88ffd96
@ -28,25 +28,25 @@ BuildRequires: go-md2man
|
||||
Recommends: fuse-overlayfs
|
||||
Recommends: slirp4netns
|
||||
Recommends: subscription-manager
|
||||
Source1: %{github_containers}/storage/%{storage_branch}/storage.conf
|
||||
Source2: %{github_containers}/storage/%{storage_branch}/docs/containers-storage.conf.5.md
|
||||
Source1: storage.conf
|
||||
Source2: containers-storage.conf.5.md
|
||||
Source3: mounts.conf
|
||||
Source4: %{github_containers}/image/%{image_branch}/docs/containers-registries.conf.5.md
|
||||
Source5: %{github_containers}/image/%{image_branch}/registries.conf
|
||||
Source6: %{github_containers}/image/%{image_branch}/docs/containers-policy.json.5.md
|
||||
Source7: %{github_containers}/common/%{common_branch}/pkg/seccomp/seccomp.json
|
||||
Source8: %{github_containers}/podman/%{podman_branch}/docs/source/markdown/containers-mounts.conf.5.md
|
||||
Source9: %{github_containers}/image/%{image_branch}/docs/containers-signature.5.md
|
||||
Source10: %{github_containers}/image/%{image_branch}/docs/containers-transports.5.md
|
||||
Source11: %{github_containers}/image/%{image_branch}/docs/containers-certs.d.5.md
|
||||
Source12: %{github_containers}/image/%{image_branch}/docs/containers-registries.d.5.md
|
||||
Source13: %{github_containers}/common/%{common_branch}/pkg/config/containers.conf
|
||||
Source14: %{github_containers}/common/%{common_branch}/docs/containers.conf.5.md
|
||||
Source15: %{github_containers}/image/%{image_branch}/docs/containers-auth.json.5.md
|
||||
Source16: %{github_containers}/image/%{image_branch}/docs/containers-registries.conf.d.5.md
|
||||
Source17: %{github_containers}/skopeo/%{skopeo_branch}/integration/fixtures/policy.json
|
||||
Source18: %{github_containers}/skopeo/%{skopeo_branch}/default.yaml
|
||||
Source19: %{github_containers}/shortnames/%{shortnames_branch}/shortnames.conf
|
||||
Source4: containers-registries.conf.5.md
|
||||
Source5: registries.conf
|
||||
Source6: containers-policy.json.5.md
|
||||
Source7: seccomp.json
|
||||
Source8: containers-mounts.conf.5.md
|
||||
Source9: containers-signature.5.md
|
||||
Source10: containers-transports.5.md
|
||||
Source11: containers-certs.d.5.md
|
||||
Source12: containers-registries.d.5.md
|
||||
Source13: containers.conf
|
||||
Source14: containers.conf.5.md
|
||||
Source15: containers-auth.json.5.md
|
||||
Source16: containers-registries.conf.d.5.md
|
||||
Source17: policy.json
|
||||
Source18: default.yaml
|
||||
Source19: shortnames.conf
|
||||
# use this script to update sources above - it assures it contains required content
|
||||
Source20: update.sh
|
||||
|
||||
@ -120,6 +120,7 @@ ln -s %{_sysconfdir}/yum.repos.d/redhat.repo %{buildroot}%{_datadir}/rhel/secret
|
||||
%changelog
|
||||
* Tue Jan 12 2021 Lokesh Mandvekar <lsm5@fedoraproject.org> - 4:0.33.0-1
|
||||
- update registries.conf and other files
|
||||
- source urls in update.sh
|
||||
|
||||
* Tue Dec 08 2020 Jindrich Novy <jnovy@redhat.com> - 3:1-1
|
||||
- initial build
|
||||
|
||||
55
shortnames.conf
Normal file
55
shortnames.conf
Normal file
@ -0,0 +1,55 @@
|
||||
[aliases]
|
||||
# centos
|
||||
"centos" = "registry.centos.org/centos"
|
||||
# containers
|
||||
"skopeo" = "quay.io/skopeo/stable"
|
||||
"buildah" = "quay.io/buildah/stable"
|
||||
"podman" = "quay.io/podman/stable"
|
||||
# docker
|
||||
"alpine" = "docker.io/library/alpine"
|
||||
"docker" = "docker.io/library/docker"
|
||||
"registry" = "docker.io/library/registry"
|
||||
"hello-world" = "docker.io/library/hello-world"
|
||||
"swarm" = "docker.io/library/swarm"
|
||||
# Fedora
|
||||
"fedora-minimal" = "registry.fedoraproject.org/fedora-minimal"
|
||||
"fedora" = "registry.fedoraproject.org/fedora"
|
||||
# openSUSE
|
||||
"opensuse/tumbleweed" = "registry.opensuse.org/opensuse/tumbleweed"
|
||||
"opensuse/tumbleweed-dnf" = "registry.opensuse.org/opensuse/tumbleweed-dnf"
|
||||
"opensuse/tumbleweed-microdnf" = "registry.opensuse.org/opensuse/tumbleweed-microdnf"
|
||||
"opensuse/leap" = "registry.opensuse.org/opensuse/leap"
|
||||
"opensuse/busybox" = "registry.opensuse.org/opensuse/busybox"
|
||||
"tumbleweed" = "registry.opensuse.org/opensuse/tumbleweed"
|
||||
"tumbleweed-dnf" = "registry.opensuse.org/opensuse/tumbleweed-dnf"
|
||||
"tumbleweed-microdnf" = "registry.opensuse.org/opensuse/tumbleweed-microdnf"
|
||||
"leap" = "registry.opensuse.org/opensuse/leap"
|
||||
"tw-busybox" = "registry.opensuse.org/opensuse/busybox"
|
||||
# SUSE
|
||||
"suse/sle15" = "registry.suse.com/suse/sle15"
|
||||
"suse/sles12sp5" = "registry.suse.com/suse/sles12sp5"
|
||||
"suse/sles12sp4" = "registry.suse.com/suse/sles12sp4"
|
||||
"suse/sles12sp3" = "registry.suse.com/suse/sles12sp3"
|
||||
"sle15" = "registry.suse.com/suse/sle15"
|
||||
"sles12sp5" = "registry.suse.com/suse/sles12sp5"
|
||||
"sles12sp4" = "registry.suse.com/suse/sles12sp4"
|
||||
"sles12sp3" = "registry.suse.com/suse/sles12sp3"
|
||||
# Red Hat Enterprise Linux
|
||||
"rhel" = "registry.access.redhat.com/rhel"
|
||||
"rhel6" = "registry.access.redhat.com/rhel6"
|
||||
"rhel7" = "registry.access.redhat.com/rhel7"
|
||||
"ubi7" = "registry.access.redhat.com/ubi7"
|
||||
"ubi7-init" = "registry.access.redhat.com/ubi7-init"
|
||||
"ubi7-minimal" = "registry.access.redhat.com/ubi7-minimal"
|
||||
"ubi8" = "registry.access.redhat.com/ubi8"
|
||||
"ubi8-minimal" = "registry.access.redhat.com/ubi8-minimal"
|
||||
"ubi8-init" = "registry.access.redhat.com/ubi8-init"
|
||||
"ubi8-micro" = "registry.access.redhat.com/ubi8-micro"
|
||||
"ubi8/ubi" = "registry.access.redhat.com/ubi8/ubi"
|
||||
"ubi8/ubi-minimal" = "registry.access.redhat.com/ubi8-minimal"
|
||||
"ubi8/ubi-init" = "registry.access.redhat.com/ubi8-init"
|
||||
"ubi8/ubi-micro" = "registry.access.redhat.com/ubi8-micro"
|
||||
# Debian
|
||||
"debian" = "docker.io/library/debian"
|
||||
# Oracle Linux
|
||||
"oraclelinux" = "container-registry.oracle.com/os/oraclelinux"
|
||||
86
update.sh
86
update.sh
@ -1,5 +1,89 @@
|
||||
#!/bin/bash
|
||||
spectool -fg containers-common.spec
|
||||
|
||||
export GITHUB_CONTAINERS="https://raw.githubusercontent.com/containers"
|
||||
export COMMON_BRANCH="master"
|
||||
export IMAGE_BRANCH="master"
|
||||
export PODMAN_BRANCH="master"
|
||||
export SHORTNAMES_BRANCH="master"
|
||||
export SKOPEO_BRANCH="master"
|
||||
export STORAGE_BRANCH="master"
|
||||
|
||||
#Source1
|
||||
rm -f storage.conf
|
||||
wget $GITHUB_CONTAINERS/storage/$STORAGE_BRANCH/storage.conf
|
||||
|
||||
#Source2
|
||||
rm -f containers-storage.conf.5.md
|
||||
wget $GITHUB_CONTAINERS/storage/$STORAGE_BRANCH/docs/containers-storage.conf.5.md
|
||||
|
||||
#Source3
|
||||
rm -f mounts.conf
|
||||
wget $GITHUB_CONTAINERS/common/$COMMON_BRANCH/pkg/subscriptions/mounts.conf
|
||||
|
||||
#Source4
|
||||
rm -f containers-registries.conf.5.md
|
||||
wget $GITHUB_CONTAINERS/image/$IMAGE_BRANCH/docs/containers-registries.conf.5.md
|
||||
|
||||
#Source5
|
||||
rm -f registries.conf
|
||||
wget $GITHUB_CONTAINERS/image/$IMAGE_BRANCH/registries.conf
|
||||
|
||||
#Source6
|
||||
rm -f containers-policy.json.5.md
|
||||
wget $GITHUB_CONTAINERS/image/$IMAGE_BRANCH/docs/containers-policy.json.5.md
|
||||
|
||||
#Source7
|
||||
rm -f seccomp.json
|
||||
wget $GITHUB_CONTAINERS/common/$COMMON_BRANCH/pkg/seccomp/seccomp.json
|
||||
|
||||
#Source8
|
||||
rm -f containers-mounts.conf.5.md
|
||||
wget $GITHUB_CONTAINERS/podman/$PODMAN_BRANCH/docs/source/markdown/containers-mounts.conf.5.md
|
||||
|
||||
#Source9
|
||||
rm -f containers-signature.5.md
|
||||
wget $GITHUB_CONTAINERS/image/$IMAGE_BRANCH/docs/containers-signature.5.md
|
||||
|
||||
#Source10
|
||||
rm -f containers-transports.5.md
|
||||
wget $GITHUB_CONTAINERS/image/$IMAGE_BRANCH/docs/containers-transports.5.md
|
||||
|
||||
#Source11
|
||||
rm -f containers-certs.d.5.md
|
||||
wget $GITHUB_CONTAINERS/image/$IMAGE_BRANCH/docs/containers-certs.d.5.md
|
||||
|
||||
#Source12
|
||||
rm -f containers-registries.d.5.md
|
||||
wget $GITHUB_CONTAINERS/image/$IMAGE_BRANCH/docs/containers-registries.d.5.md
|
||||
|
||||
#Source13
|
||||
rm -f containers.conf
|
||||
wget $GITHUB_CONTAINERS/common/$COMMON_BRANCH/pkg/config/containers.conf
|
||||
|
||||
#Source14
|
||||
rm -f containers.conf.5.md
|
||||
wget $GITHUB_CONTAINERS/common/$COMMON_BRANCH/docs/containers.conf.5.md
|
||||
|
||||
#Source15
|
||||
rm -f containers-auth.json.5.md
|
||||
wget $GITHUB_CONTAINERS/image/$IMAGE_BRANCH/docs/containers-auth.json.5.md
|
||||
|
||||
#Source16
|
||||
rm -f containers-registries.conf.d.5.md
|
||||
wget $GITHUB_CONTAINERS/image/$IMAGE_BRANCH/docs/containers-registries.conf.d.5.md
|
||||
|
||||
#Source17
|
||||
rm -f policy.json
|
||||
wget $GITHUB_CONTAINERS/skopeo/$SKOPEO_BRANCH/integration/fixtures/policy.json
|
||||
|
||||
#Source18
|
||||
rm -f default.yaml
|
||||
wget $GITHUB_CONTAINERS/skopeo/$SKOPEO_BRANCH/default.yaml
|
||||
|
||||
#Source19
|
||||
rm -f shortnames.conf
|
||||
wget $GITHUB_CONTAINERS/shortnames/$SHORTNAMES_BRANCH/shortnames.conf
|
||||
|
||||
sed -i -e 's/^driver.*=.*/driver = "overlay"/' -e 's/^mountopt.*=.*/mountopt = "nodev,metacopy=on"/' storage.conf
|
||||
[ `grep "keyctl" seccomp.json | wc -l` == 0 ] && sed -i '/\"kill\",/i \
|
||||
"keyctl",' seccomp.json
|
||||
|
||||
Loading…
Reference in New Issue
Block a user