Skip to content

Commit

Permalink
Put psygogreen in a separate requirements file
Browse files Browse the repository at this point in the history
We don't want psycogreen to appear in requirements when building the
RPM package.

We want psygogreen only in the container.

Change-Id: I687d989ca5d5a1075edd48b0830c26e25b7f787c
  • Loading branch information
fcharlier committed Feb 7, 2025
1 parent 57bb2d2 commit e654a20
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 3 deletions.
4 changes: 2 additions & 2 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -8,14 +8,14 @@ RUN update-ca-trust
WORKDIR /opt/dci-control-server

# install dependencies first
COPY requirements.txt setup.py /opt/dci-control-server/
COPY requirements.txt requirements_container.txt /opt/dci-control-server/

RUN microdnf update && \
microdnf -y install python3-pip python3-wheel && \
rpm -qa | sort > /tmp/rpms_before && \
microdnf -y install python3-devel make gcc gcc-c++ postgresql-devel diffutils findutils file && \
rpm -qa | sort > /tmp/rpms_after && \
pip3 --no-cache-dir install -r requirements.txt && \
pip3 --no-cache-dir install -r requirements.txt -r requirements_container.txt && \
comm -13 /tmp/rpms_before /tmp/rpms_after | xargs microdnf remove && \
rm /tmp/rpms_before /tmp/rpms_after && \
microdnf -y clean all
Expand Down
1 change: 0 additions & 1 deletion requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@ pyparsing==2.1.10 # pyparsing-2.1.10-7.el8.src.rpm baseos
pytz==2017.2 # pytz-2017.2-9.el8.src.rpm appstream
psycopg2==2.7.5;python_version<="3.6" # python-psycopg2-2.7.5-7.el8.src.rpm appstream
psycopg2-binary;python_version>"3.6"
psycogreen
pyOpenSSL==19.0.0 # pyOpenSSL-19.0.0-1.el8.src.rpm appstream
jsonschema==2.6.0 # python-jsonschema-2.6.0-4.el8.src.rpm appstream
SQLAlchemy==1.3.2 # python-sqlalchemy-1.3.2-2.module_el8.5.0+761+faacb0fb.src.rpm appstream
Expand Down
2 changes: 2 additions & 0 deletions requirements_container.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
psycogreen

0 comments on commit e654a20

Please sign in to comment.