Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update Dockerfile v0.57 #572

Merged
merged 6 commits into from
Mar 1, 2022
Merged

Update Dockerfile v0.57 #572

merged 6 commits into from
Mar 1, 2022

Conversation

juhoinkinen
Copy link
Member

  • Install rsync to allow transferring models to OpenShift environment
  • Ensure pip & setuptools are updated when building
  • Install voikko system packages only if Voikko is included in optional dependencies
  • Remove retry loop for nltk data download (hopefully not needed anymore, as the network problems encountered in Drone should not exist in GH Actions)

@codecov
Copy link

codecov bot commented Feb 16, 2022

Codecov Report

Merging #572 (85f7a1a) into master (7f4fc02) will not change coverage.
The diff coverage is n/a.

Impacted file tree graph

@@           Coverage Diff           @@
##           master     #572   +/-   ##
=======================================
  Coverage   99.47%   99.47%           
=======================================
  Files          84       84           
  Lines        5568     5568           
=======================================
  Hits         5539     5539           
  Misses         29       29           

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 7f4fc02...85f7a1a. Read the comment docs.

Dockerfile Outdated
@@ -9,6 +9,7 @@ RUN if [[ $optional_dependencies =~ "fasttext" ]]; then \
apt-get update && \
apt-get install -y --no-install-recommends \
build-essential && \
pip install --upgrade pip setuptools --no-cache-dir && \
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Would it make sense to install wheel here as well? In my understanding, it might speed up installation of some Python packages - they can be installed from prebuilt wheels instead of rebuilt. Not sure if that is relevant for the Annif dependencies though.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes it would. When installing deps for unit test runs in GH Action, there are messages like
Using legacy 'setup.py install' for xxx, since package 'wheel' is not installed.
I was confused as I did not see these messages in Docker builds, but that was just because wheel actually was available as it got installed as a dependency (of TensorFlow?).

(I'll install wheel also for unit test runs.)

Dockerfile Outdated

WORKDIR /Annif
RUN pip install --upgrade pip --no-cache-dir
RUN pip install --upgrade pip setuptools --no-cache-dir
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Or maybe this would be a better place for wheel...

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

And here too.

@sonarcloud
Copy link

sonarcloud bot commented Feb 16, 2022

Kudos, SonarCloud Quality Gate passed!    Quality Gate passed

Bug A 0 Bugs
Vulnerability A 0 Vulnerabilities
Security Hotspot A 0 Security Hotspots
Code Smell A 0 Code Smells

No Coverage information No Coverage information
No Duplication information No Duplication information

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants