containers/ws: Move COPR setup into install.sh

There is little gain for doing this in Dockerfile, and wasting a entire
container layer for this. We don't even need it when installing local
RPMS, so move it to install.sh and only do it for the "install official
packages" case.

containers/ws/Dockerfile

@@ -6,14 +6,10 @@ ARG VERSION
 
 ADD . /container
 
-RUN echo -e '[group_cockpit-cockpit-preview]\nname=Copr repo for cockpit-preview owned by @cockpit\nbaseurl=https://copr-be.cloud.fedoraproject.org/results/@cockpit/cockpit-preview/fedora-$releasever-$basearch/\ntype=rpm-md\ngpgcheck=1\ngpgkey=https://copr-be.cloud.fedoraproject.org/results/@cockpit/cockpit-preview/pubkey.gpg\nrepo_gpgcheck=0\nenabled=1\nenabled_metadata=1' > /etc/yum.repos.d/cockpit.repo
-
 RUN /container/install.sh
 
 LABEL INSTALL="docker run --rm --privileged -v /:/host -e IMAGE=\${IMAGE} \${IMAGE} /container/label-install \${IMAGE}"
 LABEL UNINSTALL="docker run --rm --privileged -v /:/host -e IMAGE=\${IMAGE} \${IMAGE} /container/label-uninstall"
 LABEL RUN="docker run -d --name \${NAME} --privileged --pid=host -v /:/host -e NAME=\${NAME} -e IMAGE=\${IMAGE} \${IMAGE} /container/label-run"
 
-# Look ma, no EXPOSE
-
 CMD ["/container/label-run"]

containers/ws/install.sh

@@ -27,6 +27,8 @@ rpm=$(ls /container/rpms/cockpit-ws-*$OSVER.*$arch.rpm /container/rpms/cockpit-b
 if [ -n "$rpm" ]; then
     $INSTALLER -y install /container/rpms/cockpit-ws-*$OSVER.*$arch.rpm /container/rpms/cockpit-bridge-*$OSVER.*$arch.rpm
 else
+    # pull packages from https://copr.fedorainfracloud.org/coprs/g/cockpit/cockpit-preview/
+    echo -e '[group_cockpit-cockpit-preview]\nname=Copr repo for cockpit-preview owned by @cockpit\nbaseurl=https://copr-be.cloud.fedoraproject.org/results/@cockpit/cockpit-preview/fedora-$releasever-$basearch/\ntype=rpm-md\ngpgcheck=1\ngpgkey=https://copr-be.cloud.fedoraproject.org/results/@cockpit/cockpit-preview/pubkey.gpg\nrepo_gpgcheck=0\nenabled=1\nenabled_metadata=1' > /etc/yum.repos.d/cockpit.repo
     ws=$(package_name "cockpit-ws")
     bridge=$(package_name "cockpit-bridge")
     "$INSTALLER" -y install "$ws" "$bridge"