import skopeo-1.2.2-10.module+el8.4.0+11311+9da8acfb

SOURCES/002-rhel-shortnames-overrides.conf

@@ -0,0 +1,8 @@
+[aliases]
+"skopeo"  = "registry.access.redhat.com/ubi8/skopeo"
+"ubi8/skopeo" = "registry.access.redhat.com/ubi8/skopeo"
+"buildah" = "registry.access.redhat.com/ubi8/buildah"
+"ubi8/buildah" = "registry.access.redhat.com/ubi8/buildah"
+"podman" = "registry.access.redhat.com/ubi8/podman"
+"ubi8/podman" = "registry.access.redhat.com/ubi8/podman"
+"rhel8/podman" = "registry.redhat.io/rhel8/podman"

SOURCES/containers.conf

@@ -299,6 +299,7 @@ default_sysctls = [
 # Selects which logging mechanism to use for container engine events.
 # Valid values are `journald`, `file` and `none`.
 #
+# events_logger = "journald"
 events_logger = "file"
 
 # Path to OCI hooks directories for automatically executed hooks.
@@ -393,6 +394,7 @@ infra_image = "registry.access.redhat.com/ubi8/pause"
 
 # Default OCI runtime
 #
+# runtime = "crun"
 runtime = "runc"
 
 # List of the OCI runtimes that support --format=json.  When json is supported

SOURCES/pyxis.sh

@@ -0,0 +1,72 @@
+#!/bin/bash
+#set -x
+#rm -f /tmp/pyxis*.json
+TOTAL=`curl -s --negotiate -u: -H 'Content-Type: application/json' -H 'Accept: application/json' -X GET "https://pyxis.engineering.redhat.com/v1/repositories?page_size=1" | jq .total`
+PAGES=$(($TOTAL/500))
+for P in `seq 0 $PAGES`; do
+  curl -s --negotiate -u: -H 'Content-Type: application/json' -H 'Accept: application/json' -X GET "https://pyxis.engineering.redhat.com/v1/repositories?page_size=500&page=$P" > /tmp/pyxis$P.json
+done
+cat /tmp/pyxis*.json > /tmp/pyx.json
+rm -f /tmp/rhel-shortnames.conf
+while read -r LINE; do
+  if [[ "$LINE" == *\"_id\":* ]] || [[ "$LINE" == *\"total\":* ]]; then
+    if [ -z $REGISTRY ] ||
+       [ -z $PUBLISHED ] ||
+       [ -z $REPOSITORY ] ||
+       [  $REPOSITORY == \"\" ] ||
+       [ "$AVAILABLE" != "Generally Available" ] ||
+       [[ $REPOSITORY == *[@:]* ]] ||
+       [[ "$REGISTRY" == *non_registry* ]] ||
+       [[ $REGISTRY != *.* ]]
+     then
+      continue
+    fi
+    if [[ $REGISTRY == *quay.io* ]] ||
+       [[ $REGISTRY == *redhat.com* ]]; then
+      if [ "$REQUIRES_TERMS" == "1" ]; then
+        REGISTRY=registry.redhat.io
+      fi
+      echo "\"$REPOSITORY\" = \"$REGISTRY/$REPOSITORY\""
+      echo "\"$REPOSITORY\" = \"$REGISTRY/$REPOSITORY\"" >> /tmp/rhel-shortnames.conf
+    fi
+    REGISTRY=""
+    PUBLISHED=""
+    AVAILABLE=""
+    REPOSITORY=""
+    REQUIRES_TERMS=""
+    continue
+  fi
+  if [[ "$LINE" == *\"published\":\ true,* ]]; then
+    PUBLISHED=1
+  fi
+  if [[ "$LINE" == *\"requires_terms\":\ true,* ]]; then
+    REQUIRES_TERMS=1
+  fi
+  if [[ "$LINE" == *\"repository\":\ * ]]; then
+    REPOSITORY=`echo $LINE | sed 's,^.* ",,' | sed 's;",$;;'`
+  fi
+  if [[ "$LINE" == *\"registry\":\ * ]]; then
+    REGISTRY=`echo $LINE | sed -e 's,^.*:\ ",,' -e 's,".*,,'`
+  fi
+  if [[ "$LINE" == *\"release_categories\":\ * ]]; then
+    read -r LINE
+    AVAILABLE=`echo $LINE | sed 's,",,g'`
+  fi
+done < /tmp/pyx.json
+
+cp /tmp/rhel-shortnames.conf /tmp/r.conf
+for D in `cut -d\  -f1 /tmp/r.conf | sort | uniq -d`; do
+  echo $D
+  M=`grep ^$D /tmp/r.conf | grep 'redhat.com' | tail -n1`
+  [ -z "$M" ] && M=`grep ^$D /tmp/r.conf | tail -n1`
+  echo $M
+  if [ ! -z "$M" ]; then
+    echo "replacing $D with $M"
+    grep -v "^$D.*" /tmp/r.conf > /tmp/r2.conf
+    echo "$M" >> /tmp/r2.conf
+    mv /tmp/r2.conf /tmp/r.conf
+  fi
+done
+
+echo "[aliases]" > 001-rhel-shortnames-pyxis.conf
+sort /tmp/r.conf >> 001-rhel-shortnames-pyxis.conf

SOURCES/shortnames.conf

@@ -24,6 +24,8 @@
   "tumbleweed-dnf" = "registry.opensuse.org/opensuse/tumbleweed-dnf"
   "tumbleweed-microdnf" = "registry.opensuse.org/opensuse/tumbleweed-microdnf"
   "leap" = "registry.opensuse.org/opensuse/leap"
+  "leap-dnf" = "registry.opensuse.org/opensuse/leap-dnf"
+  "leap-microdnf" = "registry.opensuse.org/opensuse/leap-microdnf"
   "tw-busybox" = "registry.opensuse.org/opensuse/busybox"
   # SUSE
   "suse/sle15" = "registry.suse.com/suse/sle15"
@@ -51,5 +53,11 @@
   "ubi8/ubi-micro" = "registry.access.redhat.com/ubi8-micro"
   # Debian
   "debian" = "docker.io/library/debian"
+  # Ubuntu
+  "ubuntu" = "docker.io/library/ubuntu"
   # Oracle Linux
-  "oraclelinux" = "container-registry.oracle.com/os/oraclelinux"
+  "oraclelinux" = "docker.io/library/oraclelinux"
+  # busybox
+  "busybox" = "docker.io/library/busybox"
+  # php
+  "php" = "docker.io/library/php"

SOURCES/update-vendored.sh

@@ -0,0 +1,28 @@
+#!/bin/bash
+# This script assures we always deliver the current documentation/configs
+# for the c/storage, c/image and c/common vendored in podman, skopeo, buildah
+# For questions reach to Jindrich Novy <jnovy@redhat.com>
+set -xe
+rm -f /tmp/ver_image /tmp/ver_common /tmp/ver_storage
+B=`rhpkg switch-branch | grep ^* | cut -d\  -f2`
+echo $B
+for P in podman skopeo buildah; do
+  rm -rf $P
+  rhpkg clone $P
+  cd $P
+  rhpkg switch-branch $B
+  rhpkg prep
+  DIR=`ls -d -- */ | grep -v ^tests | head -n1`
+  grep github.com/containers/image $DIR/go.mod | cut -d\  -f2 >> /tmp/ver_image
+  grep github.com/containers/common $DIR/go.mod | cut -d\  -f2 >> /tmp/ver_common
+  grep github.com/containers/storage $DIR/go.mod | cut -d\  -f2 >> /tmp/ver_storage
+  cd -
+done
+IMAGE_VER=`sort -n /tmp/ver_image | head -n1`
+COMMON_VER=`sort -n /tmp/ver_common | head -n1`
+STORAGE_VER=`sort -n /tmp/ver_storage | head -n1`
+sed -i "s,^%global.*image_branch.*,%global image_branch $IMAGE_VER," skopeo.spec
+sed -i "s,^%global.*common_branch.*,%global common_branch $COMMON_VER," skopeo.spec
+sed -i "s,^%global.*storage_branch.*,%global storage_branch $STORAGE_VER," skopeo.spec
+rm -f /tmp/ver_image /tmp/ver_common /tmp/ver_storage
+rm -rf podman skopeo buildah

SOURCES/update.sh

@@ -0,0 +1,38 @@
+#!/bin/bash
+# This script delivers current documentation/configs and assures it has the intended
+# settings for a particular branch/release.
+# For questions reach to Jindrich Novy <jnovy@redhat.com>
+
+ensure() {
+  if grep ^$2[[:blank:]].*= $1 > /dev/null
+  then
+    sed -i "s;^$2[[:blank:]]=.*;$2 = $3;" $1
+  else
+    if grep ^\#.*$2[[:blank:]].*= $1 > /dev/null
+    then
+      sed -i "/^#.*$2[[:blank:]].*=/a \
+$2 = $3" $1
+    else
+      echo "$2 = \"$3\"" >> $1
+    fi
+  fi
+}
+
+./pyxis.sh
+./update-vendored.sh
+spectool -f -g skopeo.spec
+ensure storage.conf    driver                        \"overlay\"
+ensure storage.conf    mountopt                      \"nodev,metacopy=on\"
+ensure registries.conf unqualified-search-registries [\"registry.fedoraproject.org\",\ \"registry.access.redhat.com\",\ \"registry.centos.org\",\ \"docker.io\"]
+ensure containers.conf events_logger                 \"file\"
+ensure containers.conf infra_image                   \"registry.access.redhat.com/ubi8/pause\"
+ensure containers.conf runtime                       \"runc\"
+[ `grep "keyctl" seccomp.json | wc -l` == 0 ] && sed -i '/\"kill\",/i \
+				"keyctl",' seccomp.json
+sed -i '/\"socketcall\",/i \
+				"socket",' seccomp.json
+if ! grep \"NET_RAW\" containers.conf > /dev/null
+then
+  sed -i '/^default_capabilities/a \
+    "NET_RAW",' containers.conf
+fi

SPECS/skopeo.spec

@@ -28,7 +28,7 @@ go build -buildmode pie -compiler gc -tags="rpm_crashtraceback libtrust_openssl
 Epoch: 1
 Name: skopeo
 Version: 1.2.2
-Release: 8%{?dist}
+Release: 10%{?dist}
 Summary: Inspect container images and repositories on registries
 License: ASL 2.0
 URL: %{git0}
@@ -58,14 +58,18 @@ Source15: https://raw.githubusercontent.com/containers/image/%{image_branch}/doc
 Source16: https://raw.githubusercontent.com/containers/image/%{image_branch}/docs/containers-registries.conf.d.5.md
 Source17: https://raw.githubusercontent.com/containers/shortnames/%{shortnames_branch}/shortnames.conf
 Source18: https://raw.githubusercontent.com/containers/image/%{image_branch}/docs/containers-registries.conf.5.md
-Source19: rhel-shortnames.conf
+Source19: 001-rhel-shortnames-pyxis.conf
-BuildRequires: git
+Source20: 002-rhel-shortnames-overrides.conf
+# scripts used for synchronization with upstream and shortname generation
+Source100: update.sh
+Source101: update-vendored.sh
+Source102: pyxis.sh
+BuildRequires: git-core
 BuildRequires: golang >= 1.12.12-4
 BuildRequires: go-md2man
 BuildRequires: gpgme-devel
 BuildRequires: libassuan-devel
 BuildRequires: pkgconfig(devmapper)
-BuildRequires: ostree-devel
 BuildRequires: glib2-devel
 BuildRequires: make
 Requires: containers-common = %{epoch}:%{version}-%{release}
@@ -81,6 +85,7 @@ Conflicts: atomic-registries <= 1:1.22.1-1
 Obsoletes: docker-rhsubscription <= 2:1.13.1-31
 Provides: %{name}-containers = %{epoch}:%{version}-%{release}
 Obsoletes: %{name}-containers <= 1:0.1.31-3
+Requires: crun
 Recommends: fuse-overlayfs
 Recommends: slirp4netns
 Suggests: subscription-manager
@@ -97,6 +102,7 @@ Requires: gnupg
 Requires: jq
 Requires: podman
 Requires: httpd-tools
+Requires: openssl
 
 %description tests
 %{summary}
@@ -127,7 +133,7 @@ done
 export GOPATH=$(pwd):$(pwd)/vendor:%{gopath}
 export GO111MODULE=off
 export CGO_CFLAGS="%{optflags} -D_GNU_SOURCE -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64"
-export BUILDTAGS="exclude_graphdriver_btrfs btrfs_noversion $(hack/libdm_tag.sh) $(hack/ostree_tag.sh)"
+export BUILDTAGS="exclude_graphdriver_btrfs btrfs_noversion $(hack/libdm_tag.sh)"
 mkdir -p bin
 %gobuild -o bin/%{name} ./cmd/%{name}
 %{__make} docs
@@ -141,7 +147,8 @@ install -dp %{buildroot}%{_sysconfdir}/containers/{certs.d,oci/hooks.d,registrie
 install -m0644 %{SOURCE1} %{buildroot}%{_sysconfdir}/containers/storage.conf
 install -m0644 %{SOURCE5} %{buildroot}%{_sysconfdir}/containers/registries.conf
 install -m0644 %{SOURCE17} %{buildroot}%{_sysconfdir}/containers/registries.conf.d/000-shortnames.conf
-install -m0644 %{SOURCE19} %{buildroot}%{_sysconfdir}/containers/registries.conf.d/rhel-shortnames.conf
+install -m0644 %{SOURCE19} %{buildroot}%{_sysconfdir}/containers/registries.conf.d/001-rhel-shortnames.conf
+install -m0644 %{SOURCE20} %{buildroot}%{_sysconfdir}/containers/registries.conf.d/002-rhel-shortnames-overrides.conf
 install -dp %{buildroot}%{_mandir}/man5
 go-md2man -in %{SOURCE2} -out %{buildroot}%{_mandir}/man5/containers-storage.conf.5
 go-md2man -in %{SOURCE4} -out %{buildroot}%{_mandir}/man5/containers-registries.conf.5
@@ -206,8 +213,7 @@ export GOPATH=%{buildroot}/%{gopath}:$(pwd)/vendor:%{gopath}
 %config(noreplace) %{_sysconfdir}/containers/registries.d/default.yaml
 %config(noreplace) %{_sysconfdir}/containers/storage.conf
 %config(noreplace) %{_sysconfdir}/containers/registries.conf
-%config(noreplace) %{_sysconfdir}/containers/registries.conf.d/000-shortnames.conf
+%config(noreplace) %{_sysconfdir}/containers/registries.conf.d/*.conf
-%config(noreplace) %{_sysconfdir}/containers/registries.conf.d/rhel-shortnames.conf
 %config(noreplace) %{_sysconfdir}/containers/registries.d/*.yaml
 %ghost %{_sysconfdir}/containers/containers.conf
 %dir %{_sharedstatedir}/containers/sigstore
@@ -233,6 +239,27 @@ export GOPATH=%{buildroot}/%{gopath}:$(pwd)/vendor:%{gopath}
 %{_datadir}/%{name}/test
 
 %changelog
+* Thu May 13 2021 Jindrich Novy <jnovy@redhat.com> - 1:1.2.2-10
+- re-enable release-1.2 branch
+- Related: #1954702
+
+* Thu May 13 2021 Jindrich Novy <jnovy@redhat.com> - 1:1.2.2-9
+- revert back to state of 3.0-8.4.0
+- sync shortnames with pyxis
+- improve shortnames
+- Related: #1954702
+
+* Tue May 11 2021 Jindrich Novy <jnovy@redhat.com> - 1:1.2.3-2
+- update vendored components versions
+- sync shortnames with pyxis
+- Related: #1954702
+
+* Thu Apr 29 2021 Jindrich Novy <jnovy@redhat.com> - 1:1.2.3-1
+- assure runc is set as default runtime in RHEL8
+- update shortnames from upstream
+- sync vendored component versions with upstream
+- Related: #1954702
+
 * Tue Apr 06 2021 Jindrich Novy <jnovy@redhat.com> - 1:1.2.2-8
 - use runc as default OCI runtime in RHEL8
 - Resolves: #1940854