From 4bf897a6e75e9414b96d483af0f0bcc06d71df5f Mon Sep 17 00:00:00 2001 From: Adam Piasecki Date: Jun 03 2022 17:37:07 +0000 Subject: [PATCH 1/3] Added files to build a greenwave linux image --- diff --git a/images/greenwave/Dockerfile b/images/greenwave/Dockerfile new file mode 100644 index 0000000..d84859c --- /dev/null +++ b/images/greenwave/Dockerfile @@ -0,0 +1,48 @@ +FROM registry.fedoraproject.org/fedora:35 +LABEL \ + name="Greenwave application" \ + vendor="Greenwave developers" \ + license="GPLv2+" \ + build-date="" + +RUN dnf -y install \ + git-core \ + python3-dateutil \ + python3-dogpile-cache \ + python3-fedmsg \ + python3-flask \ + python3-gunicorn \ + python3-memcached \ + python3-pip \ + python3-prometheus_client \ + python3-PyYAML \ + python3-requests \ + && dnf -y clean all \ + && rm -rf /tmp/* + +RUN git clone https://pagure.io/greenwave.git etc/greenwave + +# This will allow a non-root user to install a custom root CA at run-time +RUN chmod 777 /etc/pki/tls/certs/ca-bundle.crt + +WORKDIR /etc/greenwave + +RUN set -ex \ + && version=$(./get-version.sh) \ + && test -n "$version" \ + && sed --regexp-extended -i -e \ + "/^__version__ = /c\\__version__ = '$version'" greenwave/__init__.py \ + && pip3 install . --no-cache-dir --no-deps \ + && mkdir -p /src/docker \ + && cp -v docker/docker-entrypoint.sh /src/docker \ + && cp -vr conf /src \ + && rm -rf /tmp/* \ + # Quick test for the installed package and version + && python3 -c "import greenwave; assert(greenwave.__version__ == '$version')" + +WORKDIR /src + +USER 1001 +EXPOSE 8080 +ENTRYPOINT ["/src/docker/docker-entrypoint.sh"] +CMD ["/usr/bin/gunicorn-3", "--workers", "8", "--bind", "0.0.0.0:8080", "--access-logfile", "-", "--enable-stdio-inheritance", "greenwave.wsgi:app"] \ No newline at end of file diff --git a/images/greenwave/Makefile b/images/greenwave/Makefile new file mode 100644 index 0000000..75ba370 --- /dev/null +++ b/images/greenwave/Makefile @@ -0,0 +1,19 @@ +SHELL := /bin/bash +FEDORA_VERSION := 35 +REG := quay.io +ORG := fedora-kube-sig +NAME := greenwave +TAG := latest +IMAGE := ${REG}/${ORG}/${NAME}:${TAG} +CRI := podman + +image/build: + @${CRI} build -t ${IMAGE} --build-arg FEDORA_VERSION=${FEDORA_VERSION} . + +image/push: image/build + @${CRI} push ${IMAGE} + +image/debug: image/build + @${CRI} run -it --entrypoint /bin/bash ${IMAGE} + +.PHONY: image/build image/push image/debug From e9154b35d2aca0b1767c6de0c8453cbf5cbfaf97 Mon Sep 17 00:00:00 2001 From: Adam Piasecki Date: Jun 03 2022 17:37:07 +0000 Subject: [PATCH 2/3] Implemented suggested change to Dockerfile --- diff --git a/images/greenwave/Dockerfile b/images/greenwave/Dockerfile index d84859c..6477af4 100644 --- a/images/greenwave/Dockerfile +++ b/images/greenwave/Dockerfile @@ -22,9 +22,6 @@ RUN dnf -y install \ RUN git clone https://pagure.io/greenwave.git etc/greenwave -# This will allow a non-root user to install a custom root CA at run-time -RUN chmod 777 /etc/pki/tls/certs/ca-bundle.crt - WORKDIR /etc/greenwave RUN set -ex \ @@ -39,7 +36,7 @@ RUN set -ex \ && rm -rf /tmp/* \ # Quick test for the installed package and version && python3 -c "import greenwave; assert(greenwave.__version__ == '$version')" - + WORKDIR /src USER 1001 From 4cb2302745c2764605e76b8ec317cb64373a8aec Mon Sep 17 00:00:00 2001 From: Adam Piasecki Date: Jun 03 2022 17:37:07 +0000 Subject: [PATCH 3/3] Implemented suggested change to Dockerfile --- diff --git a/images/greenwave/Dockerfile b/images/greenwave/Dockerfile index 6477af4..2529a11 100644 --- a/images/greenwave/Dockerfile +++ b/images/greenwave/Dockerfile @@ -1,4 +1,4 @@ -FROM registry.fedoraproject.org/fedora:35 +FROM quay.io/fedora/fedora:35 LABEL \ name="Greenwave application" \ vendor="Greenwave developers" \