PR#2367: Podman-compose to use @copr/copr-dev by default - copr/copr

Pavel Raiskup • 2 years ago

8561689

Pavel Raiskup • 2 years ago

f2c89fb

docker/backend/Dockerfile

file modified

+9 -6

		`@@ -1,6 +1,8 @@`
		`FROM registry.fedoraproject.org/fedora:35`
		`MAINTAINER copr-devel@lists.fedorahosted.org`

		`+ ARG ADDITIONAL_COPR_REPOSITORIES="@copr/copr-dev"`
		`+`
		`ENV export LANG=en_US.UTF-8`
		`ENV PYTHONPATH="/usr/share/copr/"`

		`@@ -9,7 +11,11 @@`
		`LANG=en_US.UTF-8`

		`# base packages`
		`- RUN dnf -y update && \`
		`+ RUN set -ex ; \`
		`+ test -z "${ADDITIONAL_COPR_REPOSITORIES}" \`
		`+ \|\| dnf -y install dnf-plugins-core \`
		`+ && for repo in $ADDITIONAL_COPR_REPOSITORIES ; do dnf -y copr enable $repo; done ; \`
		`+ dnf -y update && \`
		`dnf -y install htop \`
		`make \`
		`wget \`
		`@@ -30,6 +36,7 @@`
		`rng-tools \`
		`# for unbuffer package`
		`expect \`
		`+ && dnf -y install copr-backend \`
		`&& dnf clean all`

		`# needed to be able to ping`
		`@@ -43,7 +50,7 @@`
		`mkdir /root/.ssh && chmod 700 /root /root/.ssh`

		`# setup copr user`
		`- RUN useradd copr && \`
		`+ RUN set -x ; \`
		`echo 'copr:passwd' \| chpasswd && \`
		`echo 'copr ALL=(ALL:ALL) NOPASSWD:ALL' >> /etc/sudoers && \`
		`mkdir -p /home/copr/.ssh && chmod 700 /home/copr /home/copr/.ssh && \`
		`@@ -53,10 +60,6 @@`
		`cat /home/copr/.ssh/id_rsa.pub >> /home/copr/.ssh/authorized_keys && \`
		`chown copr:copr -R /home/copr`

		`- # Install copr-backend package`
		`- RUN dnf -y install copr-backend && \`
		`- dnf clean all`
		`-`
		`# system setup for copr-backend`
		`RUN usermod -a -G mock copr`

docker/builder/Dockerfile

file modified

+8 -4

		`@@ -1,11 +1,17 @@`
		`FROM registry.fedoraproject.org/fedora:35`
		`MAINTAINER copr-devel@lists.fedorahosted.org`

		`+ ARG ADDITIONAL_COPR_REPOSITORIES="@copr/copr-dev"`
		`+`
		`# TERM is to make the tito work in container, rhbz#1733043`
		`ENV TERM=linux`

		`# base packages`
		`- RUN dnf -y update && \`
		`+ RUN set -ex ; \`
		`+ test -z "${ADDITIONAL_COPR_REPOSITORIES}" \`
		`+ \|\| dnf -y install dnf-plugins-core \`
		`+ && for repo in $ADDITIONAL_COPR_REPOSITORIES ; do dnf -y copr enable $repo; done ; \`
		`+ dnf -y update && \`
		`dnf -y install htop \`
		`which \`
		`wget \`
		`@@ -25,6 +31,7 @@`
		`ca-certificates \`
		`scl-utils-build \`
		`ethtool \`
		`+ && dnf -y install copr-builder \`
		`&& dnf clean all`

		`COPY files/ /`
		`@@ -38,9 +45,6 @@`
		`touch /root/.ssh/authorized_keys && chmod 600 /root/.ssh/authorized_keys && \`
		`cat /root/.ssh/id_backend.pub >> /root/.ssh/authorized_keys`

		`- RUN dnf -y install copr-builder && \`
		`- dnf clean all`
		`-`
		`RUN echo 'config_opts["use_nspawn"] = False' >> /etc/mock/site-defaults.cfg`

		`CMD ["/usr/sbin/sshd", "-D"]`

docker/distgit/Dockerfile

file modified

+7 -1

		`@@ -1,12 +1,18 @@`
		`FROM registry.fedoraproject.org/fedora:35`
		`MAINTAINER copr-devel@lists.fedorahosted.org`

		`+ ARG ADDITIONAL_COPR_REPOSITORIES="@copr/copr-dev"`
		`+`
		`# TERM is to make the tito work in container, rhbz#1733043`
		`ENV TERM=linux`
		`ENV PYTHONPATH=/usr/share/copr/`

		`# base packages`
		`- RUN dnf -y update && \`
		`+ RUN set -ex ; \`
		`+ test -z "${ADDITIONAL_COPR_REPOSITORIES}" \`
		`+ \|\| dnf -y install dnf-plugins-core \`
		`+ && for repo in $ADDITIONAL_COPR_REPOSITORIES ; do dnf -y copr enable $repo; done ; \`
		`+ dnf -y update && \`
		`dnf -y install htop \`
		`which \`
		`wget \`

docker/frontend/Dockerfile

file modified

+7 -1

		`@@ -1,13 +1,19 @@`
		`FROM registry.fedoraproject.org/fedora:35`
		`MAINTAINER copr-devel@lists.fedorahosted.org`

		`+ ARG ADDITIONAL_COPR_REPOSITORIES="@copr/copr-dev"`
		`+`
		`# TERM is to make the tito work in container, rhbz#1733043`
		`ENV TERM=linux`
		`ENV LANG=en_US.UTF-8`
		`ENV REDIS_HOST=redis`

		`# base packages`
		`- RUN dnf -y update && \`
		`+ RUN set -ex ; \`
		`+ test -z "${ADDITIONAL_COPR_REPOSITORIES}" \`
		`+ \|\| dnf -y install dnf-plugins-core \`
		`+ && for repo in $ADDITIONAL_COPR_REPOSITORIES ; do dnf -y copr enable $repo; done ; \`
		`+ dnf -y update && \`
		`dnf -y install htop \`
		`make \`
		`which \`

docker/keygen/Dockerfile

file modified

+7 -1

		`@@ -2,13 +2,19 @@`

		`MAINTAINER copr-devel@lists.fedorahosted.org`

		`+ ARG ADDITIONAL_COPR_REPOSITORIES="@copr/copr-dev"`
		`+`
		`# Create copr-signer:copr-signer manually, so we can`
		`# be sure that the UID and GID is same on all keygen containers`
		`RUN groupadd -r copr-signer -g 992`
		`RUN useradd -r copr-signer -u 993 -g 992 -G 0 -d /var/lib/copr-keygen`

		`# base packages`
		`- RUN dnf -y update && \`
		`+ RUN set -ex ; \`
		`+ test -z "${ADDITIONAL_COPR_REPOSITORIES}" \`
		`+ \|\| dnf -y install dnf-plugins-core \`
		`+ && for repo in $ADDITIONAL_COPR_REPOSITORIES ; do dnf -y copr enable $repo; done ; \`
		`+ dnf -y update && \`
		`dnf -y install htop \`
		`httpd \`
		`make \`