From 90443ac9f9f4a9f0a7d27b3c772e6102640353e2 Mon Sep 17 00:00:00 2001 From: Mark Kenney Date: Tue, 3 Mar 2020 13:12:05 -0500 Subject: [PATCH 1/4] updated to support new pipeline pattern --- 1.6.0/Dockerfile | 44 ++++++++------------ 1.6.0/Jenkinsfile | 2 + 1.6.0/download.json | 7 ++++ 1.6.0/scripts/nifi.key | 52 ------------------------ 1.6.0/scripts/nifi_dependencies.tgz.sha | 1 - 1.6.0/scripts/nifi_dependencies.tgz.sig | Bin 566 -> 0 bytes 1.6.0/scripts/prebuild.sh | 28 ------------- 7 files changed, 26 insertions(+), 108 deletions(-) create mode 100644 1.6.0/Jenkinsfile create mode 100644 1.6.0/download.json delete mode 100644 1.6.0/scripts/nifi.key delete mode 100644 1.6.0/scripts/nifi_dependencies.tgz.sha delete mode 100644 1.6.0/scripts/nifi_dependencies.tgz.sig delete mode 100644 1.6.0/scripts/prebuild.sh diff --git a/1.6.0/Dockerfile b/1.6.0/Dockerfile index c978dd3..002135f 100644 --- a/1.6.0/Dockerfile +++ b/1.6.0/Dockerfile @@ -2,56 +2,46 @@ # Default variables will be replaced by build/hardening pipelines, but defaults should lead to a successful build outside of the pipelines # If your container is not based on either the ubi7/ubi8 DCAR images, then it should be based on an image/s ultimately based on ubi7/ubi8 # Note that you will not be able to pull conatiners from nexus-docker-secure.levelup-dev.io into your local dev machine -ARG BASE_REGISTRY=nexus-docker-secure.levelup-dev.io -ARG BASE_IMAGE=dsop/openjdk-v1.8 +ARG BASE_REGISTRY=hub.docker.com +ARG BASE_IMAGE=apache/nifi +ARG BASE_TAG=1.6.0 ARG PRODUCT_API_VERSION=1 ARG PRODUCT_API_RELEASE=6.0 # FROM statement must reference the base image using the three ARGs established -FROM ${BASE_REGISTRY}/${BASE_IMAGE} - -# ENV LANG=en_US.UTF-8 LC_ALL=en_US.UTF-8 - +FROM ${BASE_REGISTRY}/${BASE_IMAGE}:{BASE_TAG} # 'LABEL' instructions should include at least the following information and any other helpful details. -LABEL product_api_commit=$API_COMMIT \ - source="https://nifi.apache.org/" \ - name="nifi" \ +LABEL name="Apache Nifi" \ maintainer="dev@nifi.apache.org" \ vendor="Apache" \ - version=$PRODUCT_API_VERSION \ - release=$PRODUCT_API_RELEASE \ + version="1.6.0" \ + release="1" \ summary="Image of Apache Nifi" \ - description="This builds a working image of Apache Nifi." - -ENV VENDOR=nifi \ - PACKAGE_NAME=nifi_dependencies.tgz - -# You must have these next three variables set exactly as is if you need to pull any files (i.e. dependencies for your container) from the Nexus repo -# Look at the next section -ARG NEXUS_SERVER=${NEXUS_SERVER} -ARG NEXUS_USERNAME=${NEXUS_USERNAME} -ARG NEXUS_PASSWORD=${NEXUS_PASSWORD} + description="Image of Apache Nifi" +ARG TARBALL=nifi-1.6.0.tar.gz RUN apt-get update && apt-get install -y --no-install-recommends ca-certificates gnupg dirmngr bzip2 unzip xz-utils jq xmlstarlet && rm -rf /var/lib/apt/lists/* -ENV LANG=C.UTF-8 +ENV NIFI_BASE_DIR=/opt/nifi +COPY ${TARBALL} ${NIFI_BASE_DIR} RUN echo 'dirname "$(dirname "$(readlink -f "$(which javac || which java)")")"' > /usr/local/bin/docker-java-home && chmod +x /usr/local/bin/docker-java-home RUN ln -svT "/usr/lib/jvm/java-8-openjdk-$(dpkg --print-architecture)" /docker-java-home RUN /var/lib/dpkg/info/ca-certificates.postinst configure ARG UID=1000 ARG GID=1000 -ENV NIFI_BASE_DIR=/opt/nifi -ENV NIFI_VERSION_DIR=nifi-${PRODUCT_API_VERSION}.${PRODUCT_API_RELEASE} ENV NIFI_HOME=${NIFI_BASE_DIR}/${NIFI_VERSION_DIR} RUN mkdir ${NIFI_BASE_DIR} RUN groupadd -g ${GID} nifi && useradd -u ${UID} -g ${GID} -m nifi && chown -R nifi:nifi ${NIFI_BASE_DIR} WORKDIR ${NIFI_BASE_DIR} -RUN curl -k -fu ${NEXUS_USERNAME}:${NEXUS_PASSWORD} https://${NEXUS_SERVER}/repository/dsop/${VENDOR}/${PACKAGE_NAME} -o ${PACKAGE_NAME} \ - && tar -zxvf ${PACKAGE_NAME} -C ${NIFI_BASE_DIR} \ +RUN tar -zxvf ${TARBALL} "nifi-rel-nifi-1.6.0/nifi-docker/dockerhub/sh/*.sh" \ && mkdir -p ${NIFI_HOME}/conf/templates \ - && chown -R nifi:nifi ${NIFI_BASE_DIR} + && mkdir -p ${NIFI_BASE_DIR}/scripts \ + && cp nifi-rel-nifi-1.6.0/nifi-docker/dockerhub/sh/*.sh ${NIFI_BASE_DIR}/scripts \ + && chown -R nifi:nifi ${NIFI_BASE_DIR} \ + && rm -rf nifi-rel-nifi-1.6.0 \ + && rm ${TARBALL} USER nifi EXPOSE 10000/tcp 8080/tcp 8443/tcp WORKDIR /opt/nifi/nifi-1.6.0 diff --git a/1.6.0/Jenkinsfile b/1.6.0/Jenkinsfile new file mode 100644 index 0000000..5e06366 --- /dev/null +++ b/1.6.0/Jenkinsfile @@ -0,0 +1,2 @@ +library 'DSOPDemo@demo-video-branch' +hardeningPipeline() diff --git a/1.6.0/download.json b/1.6.0/download.json new file mode 100644 index 0000000..5b1f294 --- /dev/null +++ b/1.6.0/download.json @@ -0,0 +1,7 @@ +{ "resources": + [ + { "url" : "https://github.com/apache/nifi/archive/rel/nifi-1.6.0.tar.gz", + "filename": "nifi-1.6.0.tar.gz", + "sha256": "624b907ab961029c0b136a07c7b68d98f02c31730dedd2c4d25a32ac405dce7a" + } +] } \ No newline at end of file diff --git a/1.6.0/scripts/nifi.key b/1.6.0/scripts/nifi.key deleted file mode 100644 index 0725811..0000000 --- a/1.6.0/scripts/nifi.key +++ /dev/null @@ -1,52 +0,0 @@ ------BEGIN PGP PUBLIC KEY BLOCK----- - -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 -HcEoL0Sl -=EXyX ------END PGP PUBLIC KEY BLOCK----- diff --git a/1.6.0/scripts/nifi_dependencies.tgz.sha b/1.6.0/scripts/nifi_dependencies.tgz.sha deleted file mode 100644 index a61bae6..0000000 --- a/1.6.0/scripts/nifi_dependencies.tgz.sha +++ /dev/null @@ -1 +0,0 @@ -568b12564109718ea1228ee3045366a22ee870a6a66f6d010fffadbd94547047 nifi_dependencies.tgz diff --git a/1.6.0/scripts/nifi_dependencies.tgz.sig b/1.6.0/scripts/nifi_dependencies.tgz.sig deleted file mode 100644 index 7c46f151a1ffd29d7a6b17af0ce7f93600b86d26..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 566 zcmV-60?GY}0y6{v0SEvc79j*fJ*s{SSfKNT7?{n9U+mKKuMign0$xhTp#TaA5Q<;y z()6zo7uS*x|7BO7ay?)U_>jg1TuT3WQznrpSEiz7m;K$Gy*B>KcY{?jV|i&hwQ5tv zV`nKu*I9X8@>|L$j-ILL>W#0U$DC?!AM}jIvr=PUdchhxM&aGs3ZhognV3ZK{v1P< zt=4hd#+v-uoZfPTx`d;S+1Jcxx&Z1U&13SruP$Y~C+Yu0uiVwziFoSt+r9!^@bad~ z-sN;K1TUL}T!e;ZO*BwH5s#WKy3b#Yplg&)f0l-m3m9x(8QJF(zn9G-p@ANw0Hg`J zsi7&w|HR6~>d=I&xW&0k$3+p9(|%lUD69qM|zLR9W>fP-=m6(DYJB}dj|f*`>7Patiu;!FwPNs~po zqeNQqR!4VC3`$G|>nBj_Eww|S59BYTuG4UI2q{$i<$qq(B3=m5HS?NCzRaSVeIL~e z4p)zXpa75%=FL91lE61ubG>}Os)vUWa%5MsSF8j4p&~4EZGt(Autot@Lce65{3Un# zMiKwM)HHm#^>Up{<~3BcGV7bX6A4ASt@cGv`9YLd8_3dT__C6Zr)$A8YGG*n=7n6) zV;depx2wx^j Date: Wed, 4 Mar 2020 09:55:46 -0500 Subject: [PATCH 2/4] updated Dockerfile --- 1.6.0/Dockerfile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/1.6.0/Dockerfile b/1.6.0/Dockerfile index 002135f..f0dc83e 100644 --- a/1.6.0/Dockerfile +++ b/1.6.0/Dockerfile @@ -25,15 +25,15 @@ ARG TARBALL=nifi-1.6.0.tar.gz RUN apt-get update && apt-get install -y --no-install-recommends ca-certificates gnupg dirmngr bzip2 unzip xz-utils jq xmlstarlet && rm -rf /var/lib/apt/lists/* ENV NIFI_BASE_DIR=/opt/nifi -COPY ${TARBALL} ${NIFI_BASE_DIR} +ENV NIFI_VERSION_DIR=nifi-${BASE_TAG} +ENV NIFI_HOME=${NIFI_BASE_DIR}/${NIFI_VERSION_DIR} RUN echo 'dirname "$(dirname "$(readlink -f "$(which javac || which java)")")"' > /usr/local/bin/docker-java-home && chmod +x /usr/local/bin/docker-java-home RUN ln -svT "/usr/lib/jvm/java-8-openjdk-$(dpkg --print-architecture)" /docker-java-home RUN /var/lib/dpkg/info/ca-certificates.postinst configure ARG UID=1000 ARG GID=1000 -ENV NIFI_HOME=${NIFI_BASE_DIR}/${NIFI_VERSION_DIR} -RUN mkdir ${NIFI_BASE_DIR} RUN groupadd -g ${GID} nifi && useradd -u ${UID} -g ${GID} -m nifi && chown -R nifi:nifi ${NIFI_BASE_DIR} +COPY ${TARBALL} ${NIFI_BASE_DIR} WORKDIR ${NIFI_BASE_DIR} RUN tar -zxvf ${TARBALL} "nifi-rel-nifi-1.6.0/nifi-docker/dockerhub/sh/*.sh" \ && mkdir -p ${NIFI_HOME}/conf/templates \ -- GitLab From 56c67a4955ffe90af0265540de337f341f3f732f Mon Sep 17 00:00:00 2001 From: Mark Kenney Date: Thu, 5 Mar 2020 13:07:29 -0500 Subject: [PATCH 3/4] updated to match new model --- 1.6.0/Dockerfile | 37 ++++++++++++++++--------------------- 1.6.0/download.json | 4 ++++ 2 files changed, 20 insertions(+), 21 deletions(-) diff --git a/1.6.0/Dockerfile b/1.6.0/Dockerfile index f0dc83e..890d6ed 100644 --- a/1.6.0/Dockerfile +++ b/1.6.0/Dockerfile @@ -2,15 +2,12 @@ # Default variables will be replaced by build/hardening pipelines, but defaults should lead to a successful build outside of the pipelines # If your container is not based on either the ubi7/ubi8 DCAR images, then it should be based on an image/s ultimately based on ubi7/ubi8 # Note that you will not be able to pull conatiners from nexus-docker-secure.levelup-dev.io into your local dev machine -ARG BASE_REGISTRY=hub.docker.com -ARG BASE_IMAGE=apache/nifi -ARG BASE_TAG=1.6.0 - -ARG PRODUCT_API_VERSION=1 -ARG PRODUCT_API_RELEASE=6.0 +ARG BASE_REGISTRY=nexus-docker-secure.levelup-dev.io +ARG BASE_IMAGE=dsop/openjdk-v1.8 +ARG BASE_TAG=latest # FROM statement must reference the base image using the three ARGs established -FROM ${BASE_REGISTRY}/${BASE_IMAGE}:{BASE_TAG} +FROM ${BASE_REGISTRY}/${BASE_IMAGE}:${BASE_TAG} # 'LABEL' instructions should include at least the following information and any other helpful details. LABEL name="Apache Nifi" \ @@ -21,27 +18,32 @@ LABEL name="Apache Nifi" \ summary="Image of Apache Nifi" \ description="Image of Apache Nifi" -ARG TARBALL=nifi-1.6.0.tar.gz +ARG BIN_TARBALL=nifi-1.6.0-bin.tar.gz +ARG SRC_TARBALL=nifi-1.6.0.tar.gz RUN apt-get update && apt-get install -y --no-install-recommends ca-certificates gnupg dirmngr bzip2 unzip xz-utils jq xmlstarlet && rm -rf /var/lib/apt/lists/* ENV NIFI_BASE_DIR=/opt/nifi -ENV NIFI_VERSION_DIR=nifi-${BASE_TAG} +ENV NIFI_VERSION_DIR=nifi-1.6.0 ENV NIFI_HOME=${NIFI_BASE_DIR}/${NIFI_VERSION_DIR} RUN echo 'dirname "$(dirname "$(readlink -f "$(which javac || which java)")")"' > /usr/local/bin/docker-java-home && chmod +x /usr/local/bin/docker-java-home RUN ln -svT "/usr/lib/jvm/java-8-openjdk-$(dpkg --print-architecture)" /docker-java-home RUN /var/lib/dpkg/info/ca-certificates.postinst configure ARG UID=1000 ARG GID=1000 +RUN mkdir -p ${NIFI_BASE_DIR} RUN groupadd -g ${GID} nifi && useradd -u ${UID} -g ${GID} -m nifi && chown -R nifi:nifi ${NIFI_BASE_DIR} -COPY ${TARBALL} ${NIFI_BASE_DIR} +COPY ${BIN_TARBALL} ${NIFI_BASE_DIR} +COPY ${SRC_TARBALL} ${NIFI_BASE_DIR} WORKDIR ${NIFI_BASE_DIR} -RUN tar -zxvf ${TARBALL} "nifi-rel-nifi-1.6.0/nifi-docker/dockerhub/sh/*.sh" \ +RUN tar -zxvf ${BIN_TARBALL} \ && mkdir -p ${NIFI_HOME}/conf/templates \ + && rm ${BIN_TARBALL} +RUN tar -zxvf ${SRC_TARBALL} "nifi-rel-nifi-1.6.0/nifi-docker/dockerhub/sh" \ && mkdir -p ${NIFI_BASE_DIR}/scripts \ - && cp nifi-rel-nifi-1.6.0/nifi-docker/dockerhub/sh/*.sh ${NIFI_BASE_DIR}/scripts \ - && chown -R nifi:nifi ${NIFI_BASE_DIR} \ + && cp nifi-rel-nifi-1.6.0/nifi-docker/dockerhub/sh/* ${NIFI_BASE_DIR}/scripts \ && rm -rf nifi-rel-nifi-1.6.0 \ - && rm ${TARBALL} + && rm ${SRC_TARBALL} +RUN chown -R nifi:nifi ${NIFI_BASE_DIR} USER nifi EXPOSE 10000/tcp 8080/tcp 8443/tcp WORKDIR /opt/nifi/nifi-1.6.0 @@ -49,10 +51,3 @@ CMD ["../scripts/start.sh"] # This Dockerfile health check is a requirement. Please add an appropriate health check for your container. HEALTHCHECK --timeout=15s CMD /opt/nifi/nifi-1.6.0/bin/nifi.sh status - - -# In order to make this container build outside of the pipeline you need to run the following: -# docker build --build-arg NEXUS_USERNAME=username --build-arg NEXUS_PASSWORD=password --build-arg NEXUS_SERVER=https://server.com -t nifi:1.6.0 . -# Make sure to replace username, password, and server address with the appropriate variables if you have your own repository. -# Otherwise, you might need to test locally by pointing curl to the location of the files on the internet - diff --git a/1.6.0/download.json b/1.6.0/download.json index 5b1f294..9d2eb1a 100644 --- a/1.6.0/download.json +++ b/1.6.0/download.json @@ -1,5 +1,9 @@ { "resources": [ + { "url" : "https://archive.apache.org/dist/nifi/1.6.0/nifi-1.6.0-bin.tar.gz", + "filename": "nifi-1.6.0-bin.tar.gz", + "sha256": "fcd8ded6e95214a282289c0bf61352337f389830fa26903ae66a81d2e9d6ad15" + }, { "url" : "https://github.com/apache/nifi/archive/rel/nifi-1.6.0.tar.gz", "filename": "nifi-1.6.0.tar.gz", "sha256": "624b907ab961029c0b136a07c7b68d98f02c31730dedd2c4d25a32ac405dce7a" -- GitLab From 6bbf738806c2a888888570192cd7dc53a9831d83 Mon Sep 17 00:00:00 2001 From: Mark Kenney Date: Thu, 5 Mar 2020 13:18:19 -0500 Subject: [PATCH 4/4] updated healthcheck timing --- 1.6.0/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/1.6.0/Dockerfile b/1.6.0/Dockerfile index 890d6ed..a8317e2 100644 --- a/1.6.0/Dockerfile +++ b/1.6.0/Dockerfile @@ -50,4 +50,4 @@ WORKDIR /opt/nifi/nifi-1.6.0 CMD ["../scripts/start.sh"] # This Dockerfile health check is a requirement. Please add an appropriate health check for your container. -HEALTHCHECK --timeout=15s CMD /opt/nifi/nifi-1.6.0/bin/nifi.sh status +HEALTHCHECK --timeout=30s CMD /opt/nifi/nifi-1.6.0/bin/nifi.sh status -- GitLab