[
https://issues.apache.org/jira/browse/NIFIREG-120?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=16347078#comment-16347078
]
ASF GitHub Bot commented on NIFIREG-120:
----------------------------------------
Github user kevdoran commented on the issue:
https://github.com/apache/nifi-registry/pull/89
@Chaffelson, In order to review the PR and merge it to master, we'll need
to be able to rebase on ASF master. When I tried this, I got failures:
```
First, rewinding head to replay your work on top of it...
Applying: NIFIREG-120 Ported simplified Dockerhub build from NiFi
Applying: NIFIREG-120 Added a readme for usage instructions
Applying: Added license header for contrib check
Applying: Included the secure mode options from the main NiFi Docker project
Applying: fix script
Applying: add xmlstarlet
Applying: expose ssl port
Applying: fix secure script
Applying: update start.sh
Applying: NIFIREG-120 Ported simplified Dockerhub build from NiFi
Using index info to reconstruct a base tree...
M pom.xml
Falling back to patching base and 3-way merge...
Auto-merging nifi-registry-docker/pom.xml
CONFLICT (add/add): Merge conflict in nifi-registry-docker/pom.xml
Auto-merging nifi-registry-docker/dockerhub/sh/start.sh
CONFLICT (add/add): Merge conflict in
nifi-registry-docker/dockerhub/sh/start.sh
Auto-merging nifi-registry-docker/dockerhub/sh/common.sh
CONFLICT (add/add): Merge conflict in
nifi-registry-docker/dockerhub/sh/common.sh
Auto-merging nifi-registry-docker/dockerhub/Dockerfile
CONFLICT (add/add): Merge conflict in
nifi-registry-docker/dockerhub/Dockerfile
error: Failed to merge in the changes.
Patch failed at 0010 NIFIREG-120 Ported simplified Dockerhub build from NiFi
The copy of the patch that failed is found in: .git/rebase-apply/patch
When you have resolved this problem, run "git rebase --continue".
If you prefer to skip this patch, run "git rebase --skip" instead.
To check out the original branch and stop rebasing, run "git rebase
--abort".
```
It looks like there are some commits that are duplicated due to merging a
branch of this branch into itself, possibly? Unfortunately, I'm not able to
work out on my own what the history of this branch should look like. It would
be helpful if you could rebase and, ideally, squash this into a single commit.
Let me know if you need assistance with this. Thanks!
> Basic Docker Image
> ------------------
>
> Key: NIFIREG-120
> URL: https://issues.apache.org/jira/browse/NIFIREG-120
> Project: NiFi Registry
> Issue Type: Improvement
> Affects Versions: 0.1.0
> Reporter: Daniel Chaffelson
> Priority: Minor
> Fix For: 0.2.0
>
>
> It would be convenient if NiFi Registry had an integrated Docker image ready
> for uploading to Dockerhub, similar to the main NiFi Project, for ease of
> integration testing.
> This could probably be ported, with some changes, from the same approach used
> in the main NiFi project for continuity.
--
This message was sent by Atlassian JIRA
(v7.6.3#76005)
