You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@nifi.apache.org by al...@apache.org on 2018/08/07 18:29:36 UTC

nifi-minifi git commit: MINIFI-468 Updating Docker resources to next release version and adjusting release binary URL.

Repository: nifi-minifi
Updated Branches:
  refs/heads/master dfab00a9c -> 6d1cd5a1d


MINIFI-468 Updating Docker resources to next release version and adjusting release binary URL.

This closes #134.

Signed-off-by: Aldrin Piri <al...@apache.org>


Project: http://git-wip-us.apache.org/repos/asf/nifi-minifi/repo
Commit: http://git-wip-us.apache.org/repos/asf/nifi-minifi/commit/6d1cd5a1
Tree: http://git-wip-us.apache.org/repos/asf/nifi-minifi/tree/6d1cd5a1
Diff: http://git-wip-us.apache.org/repos/asf/nifi-minifi/diff/6d1cd5a1

Branch: refs/heads/master
Commit: 6d1cd5a1d47a171831d16786762f12b660b2f801
Parents: dfab00a
Author: Aldrin Piri <al...@apache.org>
Authored: Fri Jul 27 11:58:18 2018 -0400
Committer: Aldrin Piri <al...@apache.org>
Committed: Tue Aug 7 14:29:13 2018 -0400

----------------------------------------------------------------------
 minifi-c2/minifi-c2-docker/dockerhub/DockerImage.txt | 2 +-
 minifi-c2/minifi-c2-docker/dockerhub/Dockerfile      | 7 ++++---
 2 files changed, 5 insertions(+), 4 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/nifi-minifi/blob/6d1cd5a1/minifi-c2/minifi-c2-docker/dockerhub/DockerImage.txt
----------------------------------------------------------------------
diff --git a/minifi-c2/minifi-c2-docker/dockerhub/DockerImage.txt b/minifi-c2/minifi-c2-docker/dockerhub/DockerImage.txt
index bc7c4a3..806ff45 100644
--- a/minifi-c2/minifi-c2-docker/dockerhub/DockerImage.txt
+++ b/minifi-c2/minifi-c2-docker/dockerhub/DockerImage.txt
@@ -13,4 +13,4 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-apacheminific2:0.1.0
+apache/nifi-minifi-c2:0.6.0

http://git-wip-us.apache.org/repos/asf/nifi-minifi/blob/6d1cd5a1/minifi-c2/minifi-c2-docker/dockerhub/Dockerfile
----------------------------------------------------------------------
diff --git a/minifi-c2/minifi-c2-docker/dockerhub/Dockerfile b/minifi-c2/minifi-c2-docker/dockerhub/Dockerfile
index 3fb6e11..05c2d51 100644
--- a/minifi-c2/minifi-c2-docker/dockerhub/Dockerfile
+++ b/minifi-c2/minifi-c2-docker/dockerhub/Dockerfile
@@ -21,11 +21,11 @@ MAINTAINER Apache MiNiFi <de...@nifi.apache.org>
 
 ARG UID=1000
 ARG GID=50
-ARG MINIFI_C2_VERSION=0.2.0
+ARG MINIFI_C2_VERSION=0.6.0
 
 ENV MINIFI_C2_BASE_DIR /opt/minifi-c2
 ENV MINIFI_C2_HOME $MINIFI_C2_BASE_DIR/minifi-c2-$MINIFI_C2_VERSION
-ENV MINIFI_C2_BINARY_URL https://archive.apache.org/dist/minifi/$MINIFI_C2_VERSION/minifi-c2-$MINIFI_C2_VERSION-bin.tar.gz
+ENV MINIFI_C2_BINARY_URL https://archive.apache.org/dist/nifi/minifi/$MINIFI_C2_VERSION/minifi-c2-$MINIFI_C2_VERSION-bin.tar.gz
 
 # Setup MiNiFi user
 RUN addgroup -g $GID c2 || groupmod -n c2 `getent group $GID | cut -d: -f1`
@@ -33,7 +33,8 @@ RUN adduser -S -H -G c2 c2
 RUN mkdir -p $MINIFI_C2_HOME
 
 # Download, validate, and expand Apache MiNiFi C2 binary.
-RUN curl -fSL $MINIFI_C2_BINARY_URL -o $MINIFI_C2_BASE_DIR/minifi-c2-$MINIFI_C2_VERSION-bin.tar.gz \
+RUN apk add curl \
+    && curl -fSL $MINIFI_C2_BINARY_URL -o $MINIFI_C2_BASE_DIR/minifi-c2-$MINIFI_C2_VERSION-bin.tar.gz \
 	&& echo "$(curl $MINIFI_C2_BINARY_URL.sha256) *$MINIFI_C2_BASE_DIR/minifi-c2-$MINIFI_C2_VERSION-bin.tar.gz" | sha256sum -c - \
 	&& tar -xvzf $MINIFI_C2_BASE_DIR/minifi-c2-$MINIFI_C2_VERSION-bin.tar.gz -C $MINIFI_C2_BASE_DIR \
 	&& rm $MINIFI_C2_BASE_DIR/minifi-c2-$MINIFI_C2_VERSION-bin.tar.gz