OPSEXP-2388: Use Tomcat native libs 2.x #200
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
gionn
reviewed
Oct 30, 2024
Dockerfile
Outdated
Comment on lines
104
to
112
| RUN if [ $DISTRIB_MAJOR -eq 8 ]; then dnf install -y dnf-plugins-core; \ | ||
| dnf config-manager -y --set-enabled powertools; \ | ||
| dnf install -y https://dl.fedoraproject.org/pub/epel/epel-release-latest-8.noarch.rpm; \ | ||
| dnf install -y openssl3-devel; \ | ||
| ln -s /usr/include/openssl3/openssl /usr/include/openssl; \ | ||
| export LIBS="-L/usr/lib64/openssl3 -Wl,-rpath,/usr/lib64/openssl3 -lssl -lcrypto"; \ | ||
| export CFLAGS="-I/usr/include/openssl3"; \ | ||
| else dnf install -y openssl-devel; \ | ||
| fi; \ |
There was a problem hiding this comment.
we have multi-line commands not following the same code style, some times we are using ; and sometimes && - which should not make any difference in this context
it seems there is also a new heredoc notation since recent buildkit
https://docs.docker.com/reference/dockerfile/#here-documents
restrain from changing untouched lines in this pr even if you feel the urge to do so, better do the code style change in a new pr
gionn
reviewed
Oct 30, 2024
Dockerfile
Outdated
Comment on lines
111
to
114
| if [ $DISTRIB_MAJOR -eq 8 ]; then dnf install -y dnf-plugins-core | ||
| dnf config-manager -y --set-enabled powertools | ||
| dnf install -y https://dl.fedoraproject.org/pub/epel/epel-release-latest-8.noarch.rpm |
There was a problem hiding this comment.
Suggested change
| if [ $DISTRIB_MAJOR -eq 8 ]; then dnf install -y dnf-plugins-core | |
| dnf config-manager -y --set-enabled powertools | |
| dnf install -y https://dl.fedoraproject.org/pub/epel/epel-release-latest-8.noarch.rpm | |
| if [ $DISTRIB_MAJOR -eq 8 ]; then | |
| dnf install -y dnf-plugins-core | |
| dnf config-manager -y --set-enabled powertools | |
| dnf install -y https://dl.fedoraproject.org/pub/epel/epel-release-latest-8.noarch.rpm |
Dockerfile
Outdated
Comment on lines
174
to
178
| if [ $DISTRIB_MAJOR -eq 8 ]; then dnf install -y dnf-plugins-core | ||
| dnf config-manager -y --set-enabled powertools | ||
| dnf install -y https://dl.fedoraproject.org/pub/epel/epel-release-latest-8.noarch.rpm |
There was a problem hiding this comment.
Suggested change
| if [ $DISTRIB_MAJOR -eq 8 ]; then dnf install -y dnf-plugins-core | |
| dnf config-manager -y --set-enabled powertools | |
| dnf install -y https://dl.fedoraproject.org/pub/epel/epel-release-latest-8.noarch.rpm | |
| if [ $DISTRIB_MAJOR -eq 8 ]; then | |
| dnf install -y dnf-plugins-core | |
| dnf config-manager -y --set-enabled powertools | |
| dnf install -y https://dl.fedoraproject.org/pub/epel/epel-release-latest-8.noarch.rpm |
gionn
approved these changes
Oct 31, 2024
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Ref: OPSEXP-2388