You are viewing a plain text version of this content. The canonical link for it is here.
Posted to issues@nifi.apache.org by "lordgamez (via GitHub)" <gi...@apache.org> on 2023/06/13 13:13:46 UTC
[GitHub] [nifi-minifi-cpp] lordgamez opened a new pull request, #1588: MINIFICPP-2136 Make base image an argument for all Docker images
lordgamez opened a new pull request, #1588:
URL: https://github.com/apache/nifi-minifi-cpp/pull/1588
https://issues.apache.org/jira/browse/MINIFICPP-2136
------------
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 main)?
- [ ] Is your initial contribution a single, squashed commit?
### For code changes:
- [ ] If adding new dependencies to the code, are these dependencies licensed in a way that is compatible for inclusion under [ASF 2.0](http://www.apache.org/legal/resolved.html#category-a)?
- [ ] If applicable, have you updated the LICENSE file?
- [ ] If applicable, have you updated the NOTICE file?
### For documentation related changes:
- [ ] Have you ensured that format looks appropriate for the output in which it is rendered?
### Note:
Please ensure that once the PR is submitted, you check GitHub Actions CI results for build issues and submit an update to your PR as soon as possible.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: issues-unsubscribe@nifi.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [nifi-minifi-cpp] lordgamez commented on a diff in pull request #1588: MINIFICPP-2136 Make base image an argument for all Docker images
Posted by "lordgamez (via GitHub)" <gi...@apache.org>.
lordgamez commented on code in PR #1588:
URL: https://github.com/apache/nifi-minifi-cpp/pull/1588#discussion_r1228377107
##########
docker/DockerBuild.sh:
##########
@@ -168,6 +169,22 @@ else
DOCKERFILE="Dockerfile"
fi
+if [ -n "${DOCKER_BASE_IMAGE}" ]; then
+ if [ -z "${DISTRO_NAME}" ]; then
+ BUILD_ARGS+=("--build-arg" "BASE_ALPINE_IMAGE=${DOCKER_BASE_IMAGE}")
+ elif [ "${DISTRO_NAME}" == "bionic" ]; then
+ BUILD_ARGS+=("--build-arg" "BASE_BIONIC_IMAGE=${DOCKER_BASE_IMAGE}")
+ elif [ "${DISTRO_NAME}" == "centos" ]; then
+ BUILD_ARGS+=("--build-arg" "BASE_CENTOS_IMAGE=${DOCKER_BASE_IMAGE}")
+ elif [ "${DISTRO_NAME}" == "fedora" ]; then
+ BUILD_ARGS+=("--build-arg" "BASE_FEDORA_IMAGE=${DOCKER_BASE_IMAGE}")
+ elif [ "${DISTRO_NAME}" == "focal" ]; then
+ BUILD_ARGS+=("--build-arg" "BASE_FOCAL_IMAGE=${DOCKER_BASE_IMAGE}")
+ elif [ "${DISTRO_NAME}" == "rockylinux" ]; then
+ BUILD_ARGS+=("--build-arg" "BASE_ROCKYLINUX_IMAGE=${DOCKER_BASE_IMAGE}")
+ fi
+fi
+
Review Comment:
Good point, I was afraid it would break something, but the `BASE_ALPINE_IMAGE` should not have been used separately so changed it in d1ba15fb7ecf7f719e3e9991e04a51a7c0bce29b
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: issues-unsubscribe@nifi.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [nifi-minifi-cpp] szaszm commented on a diff in pull request #1588: MINIFICPP-2136 Make base image an argument for all Docker images
Posted by "szaszm (via GitHub)" <gi...@apache.org>.
szaszm commented on code in PR #1588:
URL: https://github.com/apache/nifi-minifi-cpp/pull/1588#discussion_r1228213003
##########
docker/DockerBuild.sh:
##########
@@ -168,6 +169,22 @@ else
DOCKERFILE="Dockerfile"
fi
+if [ -n "${DOCKER_BASE_IMAGE}" ]; then
+ if [ -z "${DISTRO_NAME}" ]; then
+ BUILD_ARGS+=("--build-arg" "BASE_ALPINE_IMAGE=${DOCKER_BASE_IMAGE}")
+ elif [ "${DISTRO_NAME}" == "bionic" ]; then
+ BUILD_ARGS+=("--build-arg" "BASE_BIONIC_IMAGE=${DOCKER_BASE_IMAGE}")
+ elif [ "${DISTRO_NAME}" == "centos" ]; then
+ BUILD_ARGS+=("--build-arg" "BASE_CENTOS_IMAGE=${DOCKER_BASE_IMAGE}")
+ elif [ "${DISTRO_NAME}" == "fedora" ]; then
+ BUILD_ARGS+=("--build-arg" "BASE_FEDORA_IMAGE=${DOCKER_BASE_IMAGE}")
+ elif [ "${DISTRO_NAME}" == "focal" ]; then
+ BUILD_ARGS+=("--build-arg" "BASE_FOCAL_IMAGE=${DOCKER_BASE_IMAGE}")
+ elif [ "${DISTRO_NAME}" == "rockylinux" ]; then
+ BUILD_ARGS+=("--build-arg" "BASE_ROCKYLINUX_IMAGE=${DOCKER_BASE_IMAGE}")
+ fi
+fi
+
Review Comment:
Let's change the argument names instead
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: issues-unsubscribe@nifi.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [nifi-minifi-cpp] szaszm closed pull request #1588: MINIFICPP-2136 Make base image an argument for all Docker images
Posted by "szaszm (via GitHub)" <gi...@apache.org>.
szaszm closed pull request #1588: MINIFICPP-2136 Make base image an argument for all Docker images
URL: https://github.com/apache/nifi-minifi-cpp/pull/1588
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: issues-unsubscribe@nifi.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org