MINIFICPP-1024 - Fix CentOS and Fedora docker builds #641
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
bakaid
commented
Sep 5, 2019
docker/centos/Dockerfile
Outdated
| @@ -35,7 +35,8 @@ ENV MINIFI_BASE_DIR /opt/minifi | |||
| RUN mkdir -p $MINIFI_BASE_DIR | |||
| USER $USER | |||
|
|
|||
| RUN yum -y install java-1.8.0-openjdk java-1.8.0-openjdk-devel gcc g++ sudo git which maven | |||
| RUN yum -y install java-1.8.0-openjdk java-1.8.0-openjdk-devel gcc g++ sudo git which maven make | |||
| RUN yum -y install openssl openssl-devel openssl-static | |||
There was a problem hiding this comment.
This is intended to be temporary until the third party compilations are fixed in MINIFICPP-1022
There was a problem hiding this comment.
Agreed, removed the hotfix.
phrocker
requested changes
Sep 5, 2019
docker/centos/Dockerfile
Outdated
| @@ -35,7 +35,8 @@ ENV MINIFI_BASE_DIR /opt/minifi | |||
| RUN mkdir -p $MINIFI_BASE_DIR | |||
| USER $USER | |||
|
|
|||
| RUN yum -y install java-1.8.0-openjdk java-1.8.0-openjdk-devel gcc g++ sudo git which maven | |||
| RUN yum -y install java-1.8.0-openjdk java-1.8.0-openjdk-devel gcc g++ sudo git which maven make | |||
| RUN yum -y install openssl openssl-devel openssl-static | |||
phrocker
reviewed
Sep 5, 2019
| @@ -34,6 +37,7 @@ echo "CMake Source Directory: $CMAKE_SOURCE_DIR" | |||
| echo "MiNiFi Package: $MINIFI_SOURCE_CODE" | |||
|
|
|||
| # Copy the MiNiFi source tree to the Docker working directory before building | |||
| rm -rf $CMAKE_SOURCE_DIR/docker/${DISTRO_NAME}/minificppsource/ | |||
| @@ -18,6 +18,9 @@ | |||
|
|
|||
| #!/bin/bash | |||
|
|
|||
| # Fail on errors | |||
| set -e | |||
phrocker
approved these changes
Sep 5, 2019
|
I'll merge once travis finishes, but I suspect it'll be red on centos. I think that's acceptable, so I'll merge after just to make sure nothing else breaks. |
Yep, it will also be red on Fedora, hopefully for not too long. Thanks! |
arpadboda
approved these changes
Sep 5, 2019
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.
Thank you for submitting a contribution to Apache NiFi - MiNiFi C++.
In order to streamline the review of the contribution we ask you
to ensure the following steps have been taken:
For all changes:
Is there a JIRA ticket associated with this PR? Is it referenced
in the commit message?
Does your PR title start with MINIFICPP-XXXX where XXXX is the JIRA number you are trying to resolve? Pay particular attention to the hyphen "-" character.
Has your PR been rebased against the latest commit within the target branch (typically master)?
Is your initial contribution a single, squashed commit?
For code changes:
For documentation related changes:
Note:
Please ensure that once the PR is submitted, you check travis-ci for build issues and submit an update to your PR as soon as possible.