Merge pull request #182 from niti6869/main

fix: added missing packages in gnocchi image

Author: rackerchris

ContainerFiles/gnocchi

@@ -7,40 +7,18 @@ FROM ghcr.io/rackerlabs/genestack-images/ceph-libs:${CEPH_TAG} AS dependency_bui
 ARG CACHEBUST=0
 ARG GNOCCHI_VERSION=master
 ARG OS_CONSTRAINTS=master
-RUN export DEBIAN_FRONTEND=noninteractive \
-  && apt-get update && apt-get upgrade -y \
-  && apt-get install --no-install-recommends -y \
-                                             bash \
-                                             brotli \
-                                             build-essential \
-                                             curl \
-                                             docutils-common \
-                                             gettext \
-                                             git \
-                                             liberasurecode-dev \
-                                             libffi-dev \
-                                             libjs-sphinxdoc \
-                                             libjs-underscore \
-                                             libldap2-dev \
-                                             libpq-dev \
-                                             libsasl2-dev \
-                                             libsnappy-dev \
-                                             libssl-dev \
-                                             libsystemd-dev \
-                                             libxml2-dev \
-                                             libxslt1-dev \
-                                             libxslt1.1 \
-                                             pkg-config \
-                                             ssl-cert \
-                                             xmlsec1
+RUN export DEBIAN_FRONTEND=noninteractive
 RUN curl -fsSL -o /tmp/upper-constraints.txt https://opendev.org/openstack/requirements/raw/branch/${OS_CONSTRAINTS}/upper-constraints.txt \
   && sed -i '/^gnocchi===.*/d' /tmp/upper-constraints.txt \
   && /var/lib/openstack/bin/pip install --constraint /tmp/upper-constraints.txt \
                                         "gnocchi[postgresql,ceph,keystone] @ git+https://github.com/gnocchixyz/gnocchi.git@${GNOCCHI_VERSION}" \
                                         gnocchiclient \
                                         PyMySQL \
                                         pymemcache \
-                                        uwsgi
+                                        SQLAlchemy \
+                                        uwsgi \
+                                        cffi \
+                                        bcrypt
 
 COPY scripts/gnocchi-cve-patching.sh /opt/
 RUN bash /opt/gnocchi-cve-patching.sh
@@ -57,23 +35,61 @@ RUN find / -name '*.pyc' -delete \
        fi; \
      done
 
-
 FROM python:3.12-slim-bookworm
 LABEL maintainer="Rackspace"
 LABEL vendor="Rackspace OpenStack Team"
 LABEL org.opencontainers.image.name="gnocchi"
 LABEL org.opencontainers.image.description="OpenStack Service (gnocchi) built for the enterprise."
 COPY --from=dependency_build /usr/local/lib /usr/local/lib
 COPY --from=dependency_build /usr/lib/x86_64-linux-gnu /usr/lib/x86_64-linux-gnu
+COPY --from=dependency_build /usr/lib/python3/dist-packages /usr/lib/python3/dist-packages
 COPY --from=dependency_build /var/lib/openstack /var/lib/openstack
 RUN export DEBIAN_FRONTEND=noninteractive \
   && apt-get update && apt-get upgrade -y \
   && apt-get install --no-install-recommends -y \
-                                                libffi8 \
-                                                libpq5 \
-                                                libsnappy1v5 \
-                                                libxml2 \
-                                                libxslt1.1 \
+                                             apache2 \
+                                             apache2-dev \
+                                             libffi8 \
+                                             libpq5 \
+                                             libsnappy1v5 \
+                                             libxml2 \
+                                             python3 \
+                                             python3-dev \
+                                             python3-memcache \
+                                             bash \
+                                             brotli \
+                                             build-essential \
+                                             curl \
+                                             wget \
+                                             locales \
+                                             docutils-common \
+                                             gettext \
+                                             git \
+                                             libffi-dev \
+                                             libjs-sphinxdoc \
+                                             libjs-underscore \
+                                             libldap2-dev \
+                                             libpq-dev \
+                                             postgresql \
+                                             memcached \
+                                             librados-dev \
+                                             liberasurecode-dev \
+                                             python3-rados \
+                                             ceph \
+                                             libsasl2-dev \
+                                             libsnappy-dev \
+                                             libprotobuf-dev \
+                                             libssl-dev \
+                                             libsystemd-dev \
+                                             libxml2-dev \
+                                             libxslt1-dev \
+                                             libxslt1.1 \
+                                             pkg-config \
+                                             ssl-cert \
+                                             xmlsec1 \
+  && /var/lib/openstack/bin/pip install --upgrade mod_wsgi \
+  && /var/lib/openstack/bin/mod_wsgi-express module-config > /etc/apache2/mods-available/wsgi.load \
+  && a2enmod wsgi \
   && apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false \
   && apt-get clean -y \
   && rm -rf /var/lib/apt/lists/* \
@@ -85,8 +101,14 @@ RUN export DEBIAN_FRONTEND=noninteractive \
   && mkdir -p /var/lib/openstack/etc/gnocchi \
   && ln -s /var/lib/openstack/etc/gnocchi /etc/gnocchi \
   && chown gnocchi:gnocchi -h /etc/gnocchi \
-  && chown -R gnocchi:gnocchi /var/lib/openstack/etc/gnocchi
-ENV PATH="/usr/local/bin:/usr/local/sbin:/var/lib/openstack/bin:$PATH"
+  && chown -R gnocchi:gnocchi /var/lib/openstack/etc/gnocchi \
+  && sed -i 's@^ErrorLog.*@ErrorLog /dev/stderr@' /etc/apache2/apache2.conf \
+  && mkdir -p /var/run/apache2 /var/lock/apache2 /var/log/apache2 \
+  && chown www-data:www-data /var/run/apache2 /var/lock/apache2 /var/log/apache2
+# Set the environment variables for the gnocchi venv
+ENV PATH="/var/lib/openstack/bin:$PATH"
+ENV PYTHONPATH="/usr/local/lib/python3.12/site-packages:/var/lib/openstack/lib/python3.12/site-packages:$PYTHONPATH"
+# Set the working directory
 WORKDIR /var/lib/openstack
-USER 42424:42424
+# Set the entrypoint to the gnocchi upgrade command
 ENTRYPOINT ["/var/lib/openstack/bin/gnocchi-upgrade"]