Skip to content

Commit

Permalink
Adding pip packages to fix image build
Browse files Browse the repository at this point in the history
  • Loading branch information
celeztyne authored and qixiang committed Jul 28, 2023
1 parent c86ae5a commit 2f7ad11
Show file tree
Hide file tree
Showing 4 changed files with 13 additions and 5 deletions.
1 change: 1 addition & 0 deletions build-requirements.in
Original file line number Diff line number Diff line change
@@ -1,2 +1,3 @@
# required by cryptography
setuptools-rust
wheel==0.37.1
11 changes: 8 additions & 3 deletions build-requirements.txt
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#
# This file is autogenerated by pip-compile
# To update, run:
# This file is autogenerated by pip-compile with Python 3.11
# by the following command:
#
# pip-compile --generate-hashes --output-file=build-requirements.txt build-requirements.in
#
Expand All @@ -16,7 +16,12 @@ toml==0.10.2 \
--hash=sha256:806143ae5bfb6a3c6e736a764057db0e6a0e05e338b5630894a5f779cabb4f9b \
--hash=sha256:b3bda1d108d5dd99f4a20d24d9c348e91c4db7ab1b749200bded2f839ccbe68f
# via setuptools-rust
wheel==0.37.1 \
--hash=sha256:4bdcd7d840138086126cd09254dc6195fb4fc6f01c050a1d7236f2630db1d22a \
--hash=sha256:e9a504e793efbca1b8e0e9cb979a249cf4a0a7b5b8c9e8b65a5e39d49529c1c4
# via -r build-requirements.in

# WARNING: The following packages were not pinned, but pip requires them to be
# pinned when the requirements file includes hashes. Consider using the --allow-unsafe flag.
# pinned when the requirements file includes hashes and the requirement is not
# satisfied by a package already installed. Consider using the --allow-unsafe flag.
# setuptools
3 changes: 2 additions & 1 deletion docker/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,8 @@ RUN sed -i '/default_ccache_name = KEYRING:persistent:%{uid}/d' /etc/krb5.conf
ENV CRYPTOGRAPHY_DONT_BUILD_RUST=1
COPY . .
# Install dependencies and the application itself
RUN pip3 install -r build-requirements.txt --require-hashes --no-deps \
RUN pip3 install setuptools==46.1.0 \
&& pip3 install -r build-requirements.txt --require-hashes --no-deps \
&& pip3 install -r requirements.txt --require-hashes --no-deps \
&& pip3 install . --no-deps
# Remove the default fedmsg config files
Expand Down
3 changes: 2 additions & 1 deletion docker/Dockerfile-tests
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ COPY test-requirements.txt /tmp/test-requirements.txt
# Set this variable to build cryptography package without Rust
ENV CRYPTOGRAPHY_DONT_BUILD_RUST=1
# Installing the Python dependencies for Estuary Updater
RUN pip3 install -r /tmp/build-requirements.txt --require-hashes --no-deps \
RUN pip3 install setuptools==46.1.0 \
&& pip3 install -r /tmp/build-requirements.txt --require-hashes --no-deps \
&& pip3 install -r /tmp/test-requirements.txt --require-hashes --no-deps --prefix /usr
CMD ["bash", "docker/test.sh"]

0 comments on commit 2f7ad11

Please sign in to comment.