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

Symlink the new AV path to avoid breakages. #1408

Merged
merged 2 commits into from
Jun 19, 2024
Merged

Conversation

dj-maisy
Copy link
Member

What?

The new build process leaves the various ClamAV binaries in /usr/bin, whereas they were previously linked to /usr/local/bin. Let's symlink these binaries so they can still be found in the right place by Asset Manager.

@dj-maisy dj-maisy force-pushed the dj-maisy/clamav-bin-symlink branch from 307fcfc to ab50f47 Compare June 19, 2024 14:27
Dockerfile Outdated
Comment on lines 137 to 143
RUN ln -s /usr/bin/clamav-config /usr/local/bin/clamav-config && \
ln -s /usr/bin/clambc /usr/local/bin/clambc && \
ln -s /usr/bin/clamconf /usr/local/bin/clamconf && \
ln -s /usr/bin/clamdscan /usr/local/bin/clamdscan && \
ln -s /usr/bin/clamdtop /usr/local/bin/clamdtop && \
ln -s /usr/bin/clamscan /usr/local/bin/clamscan && \
ln -s /usr/bin/clamsubmit /usr/local/bin/clamsubmit && \
Copy link
Contributor

@sengi sengi Jun 19, 2024

Choose a reason for hiding this comment

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

How about:

Suggested change
RUN ln -s /usr/bin/clamav-config /usr/local/bin/clamav-config && \
ln -s /usr/bin/clambc /usr/local/bin/clambc && \
ln -s /usr/bin/clamconf /usr/local/bin/clamconf && \
ln -s /usr/bin/clamdscan /usr/local/bin/clamdscan && \
ln -s /usr/bin/clamdtop /usr/local/bin/clamdtop && \
ln -s /usr/bin/clamscan /usr/local/bin/clamscan && \
ln -s /usr/bin/clamsubmit /usr/local/bin/clamsubmit && \
RUN ln -s /usr/bin/clam* /usr/local/bin && \

Dockerfile Outdated
ln -s /usr/bin/clamdtop /usr/local/bin/clamdtop && \
ln -s /usr/bin/clamscan /usr/local/bin/clamscan && \
ln -s /usr/bin/clamsubmit /usr/local/bin/clamsubmit && \
chmod 0755 /usr/local/bin/clam*
Copy link
Contributor

Choose a reason for hiding this comment

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

This changes the mode of the link targets rather than the links themselves. Is that what you intend here? (and have you checked that it's necessary?)

@sengi
Copy link
Contributor

sengi commented Jun 19, 2024

It'd also be cool to fix the app not to specify the full path so that we can remove this workaround later.

@dj-maisy dj-maisy merged commit 756796d into main Jun 19, 2024
9 checks passed
@dj-maisy dj-maisy deleted the dj-maisy/clamav-bin-symlink branch June 19, 2024 15:41
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants