#871 fix docker compose up, move it to f30
Merged 10 months ago by praiskup. Opened 10 months ago by praiskup.
copr/ praiskup/copr post-tito-fixes  into  master

file modified
+4 -4

@@ -1,5 +1,5 @@ 

- FROM fedora:26

- MAINTAINER clime@redhat.com

+ FROM fedora:30

+ MAINTAINER copr-devel@lists.fedorahosted.org

  

  RUN dnf -y install dnf-plugins-core && dnf -y copr enable @copr/copr

  

@@ -19,7 +19,7 @@ 

                     nginx \

  # builder packages

                     packagedb-cli \

-                    fedora-cert \

+                    fedora-packager \

                     mock \

                     mock-lvm \

                     createrepo \

@@ -36,7 +36,7 @@ 

                     ethtool \

  # packages for copr-keygen

                     uwsgi \

-                    uwsgi-plugin-python \

+                    uwsgi-plugin-python3 \

  # to get more entropy for generation of gpg keys

                     rng-tools \

  # for unbuffer package

file modified
+23 -19

@@ -1,8 +1,12 @@ 

- FROM fedora:28

- MAINTAINER clime@redhat.com

+ FROM fedora:30

+ MAINTAINER copr-devel@lists.fedorahosted.org

  

  RUN dnf -y install dnf-plugins-core && dnf -y copr enable @copr/copr

  

+ # TERM is to make the tito work in container, rhbz#1733043

+ ENV TERM=linux \

+     LANG=en_US.UTF-8

+ 

  # base packages

  RUN dnf -y update && \

      dnf -y install htop \

@@ -19,12 +23,12 @@ 

                     nginx \

  # packages for copr-keygen

                     uwsgi \

-                    uwsgi-plugin-python \

+                    uwsgi-plugin-python3 \

  # to get more entropy for generation of gpg keys

                     rng-tools \

  # for unbuffer package

                     expect \

-                    rpkg && \

+                    tito && \

      dnf clean all

  

  # needed to be able to ping

@@ -78,21 +82,21 @@ 

  # copy your copr sources to the docker image

  COPY . /copr

  

- # build copr-backend from sources

- RUN rpkg --path /copr/backend spec --outdir /tmp/rpkg && \

-     dnf -y builddep /tmp/rpkg/copr-backend.spec --allowerasing && \

-     export LANG=en_US.UTF-8 && \

-     rpkg --path /copr/backend local --outdir /tmp/rpkg && \

- # upgrade the already pre-installed package if possible

-     dnf -y upgrade /tmp/rpkg/noarch/copr-backend*.noarch.rpm || true

- 

- # build copr-keygen from sources

- RUN rpkg --path /copr/keygen spec --outdir /tmp/rpkg && \

-     dnf -y builddep /tmp/rpkg/copr-keygen.spec --allowerasing && \

-     export LANG=en_US.UTF-8 && \

-     rpkg --path /copr/keygen local --outdir /tmp/rpkg && \

- # upgrade the already pre-installed package if possible

-     dnf -y upgrade /tmp/rpkg/noarch/copr-keygen*.noarch.rpm || true

+ 

+ RUN dnf -y builddep /copr/backend/*.spec --allowerasing && \

+     dnf -y builddep /copr/keygen/*.spec --allowerasing && \

+     dnf clean all

+ 

+ # build packages from sources

+ RUN cd /copr/backend && \

+     tito build --rpm --test --rpmbuild-options='--without=check' && \

+     cd ../keygen && \

+     tito build --rpm --test --rpmbuild-options='--without=check'

+ 

+ # upgrade the already pre-installed packages if possible

+ RUN dnf -y upgrade /tmp/tito/noarch/copr-keygen*.noarch.rpm \

+                    /tmp/tito/noarch/copr-backend*.noarch.rpm ; \

+     dnf clean all

  

  # copy filesystem setup and setup ownership and permissions

  COPY docker/backend/files/ /

file modified
+12 -9

@@ -1,5 +1,8 @@ 

- FROM fedora:28

- MAINTAINER jkadlcik@redhat.com

+ FROM fedora:30

+ MAINTAINER copr-devel@lists.fedorahosted.org

+ 

+ # TERM is to make the tito work in container, rhbz#1733043

+ ENV TERM=linux

  

  RUN dnf -y install dnf-plugins-core && dnf -y copr enable @copr/copr

  

@@ -13,7 +16,7 @@ 

  # builder packages

                     openssh-server \

                     packagedb-cli \

-                    fedora-cert \

+                    fedora-packager \

                     mock \

                     mock-lvm \

                     createrepo \

@@ -28,7 +31,7 @@ 

                     ca-certificates \

                     scl-utils-build \

                     ethtool \

-                    rpkg

+                    tito

  

  COPY . /copr

  COPY docker/builder/files/ /

@@ -43,11 +46,11 @@ 

      touch /root/.ssh/authorized_keys && chmod 600 /root/.ssh/authorized_keys && \

      cat /root/.ssh/id_backend.pub >> /root/.ssh/authorized_keys

  

- RUN rm -rf /tmp/rpkg/* && \

-     rpkg --path /copr/rpmbuild spec --outdir /tmp/rpkg && \

-     dnf builddep -y /tmp/rpkg/copr-rpmbuild.spec && \

-     rpkg --path /copr/rpmbuild local --outdir /tmp/rpkg && \

-     dnf -y install /tmp/rpkg/x86_64/copr-rpmbuild*.x86_64.rpm

+ RUN cd /copr/rpmbuild && \

+     dnf builddep -y *spec && \

+     tito build --rpm --test --rpmbuild-options='--without=check' && \

+     dnf -y install /tmp/tito/x86_64/copr-{rpmbuild,builder}*.x86_64.rpm --allowerasing && \

+     dnf clean all

  

  RUN echo 'config_opts["use_nspawn"] = False' >> /etc/mock/site-defaults.cfg

  

file modified
+2 -2

@@ -1,5 +1,5 @@ 

- FROM fedora:28

- MAINTAINER jkadlcik@redhat.com

+ FROM fedora:30

+ MAINTAINER copr-devel@lists.fedorahosted.org

  

  RUN dnf -y install dnf-plugins-core && dnf -y copr enable @copr/copr

  

file modified
+12 -9

@@ -1,5 +1,8 @@ 

- FROM fedora:28

- MAINTAINER jkadlcik@redhat.com

+ FROM fedora:30

+ MAINTAINER copr-devel@lists.fedorahosted.org

+ 

+ # TERM is to make the tito work in container, rhbz#1733043

+ ENV TERM=linux

  

  RUN dnf -y install dnf-plugins-core && dnf -y copr enable @copr/copr

  

@@ -12,17 +15,17 @@ 

                     supervisor \

                     copr-selinux \

                     cgit \

-                    python2-rpkg \

-                    rpkg

+                    python3-rpkg \

+                    tito

  

  COPY . /copr

  COPY docker/distgit/files/ /

  

- RUN rm -rf /tmp/rpkg/* && \

-     rpkg --path /copr/dist-git spec --outdir /tmp/rpkg && \

-     dnf builddep -y /tmp/rpkg/copr-dist-git.spec && \

-     rpkg --path /copr/dist-git local --outdir /tmp/rpkg && \

-     dnf -y install /tmp/rpkg/noarch/copr-dist-git*.noarch.rpm

+ RUN cd /copr/dist-git && \

+     dnf builddep -y *spec && \

+     tito build --rpm --test --rpmbuild-options='--without=check' && \

+     ( dnf -y install /tmp/tito/noarch/copr-dist-git*.noarch.rpm || true ) && \

+     dnf clean all

  

  RUN mkdir /tmp/copr-dist-git

  RUN chown copr-dist-git:packager /tmp/copr-dist-git

file modified
+12 -8

@@ -1,11 +1,15 @@ 

- FROM fedora:28

- MAINTAINER jkadlcik@redhat.com

+ FROM fedora:30

+ MAINTAINER copr-devel@lists.fedorahosted.org

+ 

+ # TERM is to make the tito work in container, rhbz#1733043

+ ENV TERM=linux

  

  RUN dnf -y install dnf-plugins-core && dnf -y copr enable @copr/copr

  

  # base packages

  RUN dnf -y update && \

      dnf -y install htop \

+                    make \

                     which \

                     wget \

                     vim \

@@ -16,17 +20,17 @@ 

                     python3-alembic \

                     postgresql-server \

                     redis \

-                    rpkg

+                    tito

  

  COPY . /copr

  COPY docker/frontend/files/ /

  

  # build and install copr-frontend

- RUN rm -rf /tmp/rpkg && \

-     rpkg --path /copr/frontend srpm --without doc --without check --outdir /tmp/rpkg && \

-     dnf -y builddep /tmp/rpkg/copr-frontend*.src.rpm && \

-     rpkg --path /copr/frontend local --without doc --without check --outdir /tmp/rpkg && \

-     dnf -y install /tmp/rpkg/noarch/copr-frontend*.noarch.rpm

+ RUN cd /copr/frontend && \

+     dnf builddep -y *spec && \

+     tito build --rpm --test --rpmbuild-options='--without=check' && \

+     ( dnf -y install /tmp/tito/noarch/copr-frontend*.noarch.rpm || true ) && \

+     dnf clean all

  

  RUN echo 'nameserver 8.8.8.8' | tee -a /etc/resolv.conf

  

no initial comment

Shouldn't we install copr-builder now?

yeah, I already mentioned this somewhere :-)

1 new commit added

  • [docker] install also 'copr-builder' on builder
10 months ago

3 new commits added

  • [docker] install also 'copr-builder' on builder
  • [docker] fix docker-compose up with tito
  • [docker] move docker to f30
10 months ago

rebased onto f9d5c7a

10 months ago

Pull-Request has been merged by praiskup

10 months ago