Repository: nifi-minifi Updated Branches: refs/heads/master 167fe8fb9 -> 101763a87
MINIFI-310: Changing MiNiFi docker image to use Alpine linux. This closes #87. Signed-off-by: Aldrin Piri <[email protected]> Project: http://git-wip-us.apache.org/repos/asf/nifi-minifi/repo Commit: http://git-wip-us.apache.org/repos/asf/nifi-minifi/commit/101763a8 Tree: http://git-wip-us.apache.org/repos/asf/nifi-minifi/tree/101763a8 Diff: http://git-wip-us.apache.org/repos/asf/nifi-minifi/diff/101763a8 Branch: refs/heads/master Commit: 101763a87f93e906bf1467d9fbb65368e2d72a68 Parents: 167fe8f Author: jzonthemtn <[email protected]> Authored: Fri Jun 30 19:40:16 2017 -0400 Committer: Aldrin Piri <[email protected]> Committed: Thu Jul 27 14:56:01 2017 -0400 ---------------------------------------------------------------------- minifi-docker/dockerhub/DockerImage.txt | 2 +- minifi-docker/dockerhub/Dockerfile | 8 +++++--- minifi-docker/dockermaven/Dockerfile | 13 +++++++------ 3 files changed, 13 insertions(+), 10 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/nifi-minifi/blob/101763a8/minifi-docker/dockerhub/DockerImage.txt ---------------------------------------------------------------------- diff --git a/minifi-docker/dockerhub/DockerImage.txt b/minifi-docker/dockerhub/DockerImage.txt index d3d8c55..0f031c9 100644 --- a/minifi-docker/dockerhub/DockerImage.txt +++ b/minifi-docker/dockerhub/DockerImage.txt @@ -13,4 +13,4 @@ # See the License for the specific language governing permissions and # limitations under the License. -apacheminifi:0.1.0 +apacheminifi:0.2.0 http://git-wip-us.apache.org/repos/asf/nifi-minifi/blob/101763a8/minifi-docker/dockerhub/Dockerfile ---------------------------------------------------------------------- diff --git a/minifi-docker/dockerhub/Dockerfile b/minifi-docker/dockerhub/Dockerfile index b66cfae..384340c 100644 --- a/minifi-docker/dockerhub/Dockerfile +++ b/minifi-docker/dockerhub/Dockerfile @@ -16,7 +16,7 @@ # under the License. # -FROM openjdk:8 +FROM openjdk:8-jre-alpine MAINTAINER Apache MiNiFi <[email protected]> ARG UID=1000 @@ -28,10 +28,12 @@ ENV MINIFI_HOME $MINIFI_BASE_DIR/minifi-$MINIFI_VERSION ENV MINIFI_BINARY_URL https://archive.apache.org/dist/nifi/minifi/$MINIFI_VERSION/minifi-$MINIFI_VERSION-bin.tar.gz # Setup MiNiFi user -RUN groupadd -g $GID minifi || groupmod -n minifi `getent group $GID | cut -d: -f1` -RUN useradd --shell /bin/bash -u $UID -g $GID -m minifi +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 apk --no-cache add curl + # Download, validate, and expand Apache MiNiFi binary. 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 - \ http://git-wip-us.apache.org/repos/asf/nifi-minifi/blob/101763a8/minifi-docker/dockermaven/Dockerfile ---------------------------------------------------------------------- diff --git a/minifi-docker/dockermaven/Dockerfile b/minifi-docker/dockermaven/Dockerfile index 602d985..21eea54 100644 --- a/minifi-docker/dockermaven/Dockerfile +++ b/minifi-docker/dockermaven/Dockerfile @@ -16,11 +16,12 @@ # under the License. # -FROM openjdk:8 +FROM openjdk:8-jre-alpine MAINTAINER Apache MiNiFi <[email protected]> -ARG UID=1000 -ARG GID=50 +# Values are set by Maven +ARG UID +ARG GID ARG MINIFI_VERSION ARG MINIFI_BINARY @@ -28,9 +29,9 @@ ENV MINIFI_BASE_DIR /opt/minifi ENV MINIFI_HOME $MINIFI_BASE_DIR/minifi-$MINIFI_VERSION # Setup MiNiFi user -RUN groupadd -g $GID minifi || groupmod -n minifi `getent group $GID | cut -d: -f1` -RUN useradd --shell /bin/bash -u $UID -g $GID -m minifi -RUN mkdir -p $MINIFI_HOME +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 ADD $MINIFI_BINARY $MINIFI_BASE_DIR RUN chown -R minifi:minifi $MINIFI_HOME
