This is an automated email from the ASF dual-hosted git repository.
aldrin pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/nifi-minifi.git
The following commit(s) were added to refs/heads/master by this push:
new c1bde30 Added /opt/minifi/minifi-current symlink
c1bde30 is described below
commit c1bde30306475651aaebf160b0141fc5ee89d0a0
Author: r65535 <[email protected]>
AuthorDate: Fri Jan 3 12:16:46 2020 +0000
Added /opt/minifi/minifi-current symlink
This closes #181
Signed-off-by: Aldrin Piri <[email protected]>
---
minifi-docker/dockerhub/Dockerfile | 9 +++++----
minifi-docker/dockermaven/Dockerfile | 7 ++++---
2 files changed, 9 insertions(+), 7 deletions(-)
diff --git a/minifi-docker/dockerhub/Dockerfile
b/minifi-docker/dockerhub/Dockerfile
index 484a2c7..98ea27a 100644
--- a/minifi-docker/dockerhub/Dockerfile
+++ b/minifi-docker/dockerhub/Dockerfile
@@ -24,13 +24,13 @@ ARG GID=1000
ARG MINIFI_VERSION=0.5.0
ENV MINIFI_BASE_DIR /opt/minifi
-ENV MINIFI_HOME $MINIFI_BASE_DIR/minifi-$MINIFI_VERSION
+ENV MINIFI_HOME $MINIFI_BASE_DIR/minifi-current
ENV MINIFI_BINARY_URL
https://archive.apache.org/dist/nifi/minifi/$MINIFI_VERSION/minifi-$MINIFI_VERSION-bin.tar.gz
# Setup MiNiFi user
RUN addgroup -g $GID minifi || groupmod -n minifi `getent group $GID | cut -d:
-f1`
RUN adduser -S -H -G minifi minifi
-RUN mkdir -p $MINIFI_HOME
+RUN mkdir -p $MINIFI_BASE_DIR
RUN apk --no-cache add curl
@@ -40,9 +40,10 @@ ADD sh/ ${MINIFI_BASE_DIR}/scripts/
RUN curl -fSL $MINIFI_BINARY_URL -o
$MINIFI_BASE_DIR/minifi-$MINIFI_VERSION-bin.tar.gz \
&& echo "$(curl $MINIFI_BINARY_URL.sha256)
*$MINIFI_BASE_DIR/minifi-$MINIFI_VERSION-bin.tar.gz" | sha256sum -c - \
&& tar -xvzf $MINIFI_BASE_DIR/minifi-$MINIFI_VERSION-bin.tar.gz -C
$MINIFI_BASE_DIR \
- && rm $MINIFI_BASE_DIR/minifi-$MINIFI_VERSION-bin.tar.gz
+ && rm $MINIFI_BASE_DIR/minifi-$MINIFI_VERSION-bin.tar.gz \
+ && ln -s $MINIFI_BASE_DIR/minifi-$MINIFI_VERSION $MINIFI_HOME
-RUN chown -R minifi:minifi $MINIFI_HOME
+RUN chown -R -L minifi:minifi $MINIFI_HOME
USER minifi
diff --git a/minifi-docker/dockermaven/Dockerfile
b/minifi-docker/dockermaven/Dockerfile
index 21eea54..9f0491c 100644
--- a/minifi-docker/dockermaven/Dockerfile
+++ b/minifi-docker/dockermaven/Dockerfile
@@ -26,15 +26,16 @@ ARG MINIFI_VERSION
ARG MINIFI_BINARY
ENV MINIFI_BASE_DIR /opt/minifi
-ENV MINIFI_HOME $MINIFI_BASE_DIR/minifi-$MINIFI_VERSION
+ENV MINIFI_HOME $MINIFI_BASE_DIR/minifi-current
# Setup MiNiFi user
RUN addgroup -g $GID minifi || groupmod -n minifi `getent group $GID | cut -d:
-f1`
RUN adduser -S -H -G minifi minifi
-RUN mkdir -p $MINIFI_HOME
+RUN mkdir -p $MINIFI_BASE_DIR
ADD $MINIFI_BINARY $MINIFI_BASE_DIR
-RUN chown -R minifi:minifi $MINIFI_HOME
+RUN ln -s $MINIFI_BASE_DIR/minifi-$MINIFI_VERSION $MINIFI_HOME
+RUN chown -R -L minifi:minifi $MINIFI_HOME
USER minifi
