PR#2121: podman compose up fixes - copr/copr

copr / copr

#2121 podman compose up fixes

Merged 2 years ago by praiskup. Opened 2 years ago by praiskup.

Unknown source podman-compose-up-fixes into main

docker: redis: define a volume explicitly

Pavel Raiskup • 2 years ago

8ba241c

docker: frontend: initialize the database

Pavel Raiskup • 2 years ago

1d8f9a2

docker: keygen: init ownership of files on the volume

Pavel Raiskup • 2 years ago

62eeff6

docker: assure appropriate SELinux labels for volumes

Pavel Raiskup • 2 years ago

c97761e

docker-compose.yaml

file modified

+11 -8

		`@@ -28,7 +28,7 @@`
		`tty: true`
		`volumes:`
		`- .:/opt/copr:z`
		`- - results:/var/lib/copr/public_html/results`
		`+ - results:/var/lib/copr/public_html/results:z`

		`backend-build:`
		`build:`
		`@@ -42,7 +42,7 @@`
		`tty: true`
		`volumes:`
		`- .:/opt/copr:z`
		`- - results:/var/lib/copr/public_html/results`
		`+ - results:/var/lib/copr/public_html/results:z`

		`backend-action:`
		`build:`
		`@@ -56,7 +56,7 @@`
		`tty: true`
		`volumes:`
		`- .:/opt/copr:z`
		`- - results:/var/lib/copr/public_html/results`
		`+ - results:/var/lib/copr/public_html/results:z`

		`resalloc:`
		`build:`
		`@@ -71,6 +71,8 @@`
		`redis:`
		`image: centos/redis-32-centos7`
		`hostname: redis`
		`+ volumes:`
		`+ - redis:/var/lib/redis/data`

		`backend_httpd:`
		`build:`
		`@@ -81,7 +83,7 @@`
		`ports:`
		`- "5002:5002"`
		`volumes:`
		`- - results:/var/lib/copr/public_html/results`
		`+ - results:/var/lib/copr/public_html/results:z`

		`builder:`
		`build:`
		`@@ -132,7 +134,7 @@`
		`tty: true`
		`volumes:`
		`- .:/opt/copr:z`
		`- - dist-git:/var/lib/dist-git`
		`+ - dist-git:/var/lib/dist-git:z`

		`distgit-httpd:`
		`build:`
		`@@ -144,7 +146,7 @@`
		`- "5001:80"`
		`volumes:`
		`- .:/opt/copr:z`
		`- - dist-git:/var/lib/dist-git`
		`+ - dist-git:/var/lib/dist-git:z`

		`keygen-signd:`
		`build:`
		`@@ -154,7 +156,7 @@`
		`tty: true`
		`volumes:`
		`- .:/opt/copr:z`
		`- - copr-keygen:/var/lib/copr-keygen`
		`+ - copr-keygen:/var/lib/copr-keygen:z`

		`keygen-httpd:`
		`build:`
		`@@ -164,10 +166,11 @@`
		`tty: true`
		`volumes:`
		`- .:/opt/copr:z`
		`- - copr-keygen:/var/lib/copr-keygen`
		`+ - copr-keygen:/var/lib/copr-keygen:z`

		`volumes:`
		`results:`
		`copr-keygen:`
		`dist-git:`
		`database:`
		`+ redis:`

docker/frontend/Dockerfile

file modified

+1 -1

		`@@ -75,4 +75,4 @@`

		`EXPOSE 5000`

		`- CMD ["/usr/sbin/httpd", "-DFOREGROUND"]`
		`+ CMD ["/entrypoint"]`

docker/frontend/files/entrypoint

file added

		`@@ -0,0 +1,6 @@`
		`+ #! /bin/sh`
		`+`
		`+ cd`
		`+ ./manage.py create-db --alembic alembic.ini`
		`+ ./manage.py create-chroot fedora-rawhide-x86_64`
		`+ exec /usr/sbin/httpd -DFOREGROUND`

docker/keygen-httpd/Dockerfile

file modified

+1 -1

		`@@ -39,4 +39,4 @@`

		`RUN sed -i 's/Listen 80/#Listen 80/g' /etc/httpd/conf/httpd.conf`

		`- CMD ["/usr/sbin/httpd", "-DFOREGROUND"]`
		`+ CMD ["/entrypoint"]`

docker/keygen-httpd/files/entrypoint

file added

		`@@ -0,0 +1,5 @@`
		`+ #! /bin/sh`
		`+`
		`+ # restore the ownership on files on volumes`
		`+ rpm --setugids copr-keygen`
		`+ exec /usr/sbin/httpd "-DFOREGROUND"`