From bd9f3f6cfbd405dd8554763e494a8607c25e5ac8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E2=80=9Ccrowdvector=E2=80=9D?= Date: Tue, 10 Nov 2020 22:40:00 -0500 Subject: [PATCH 1/2] Added encrypted application and libs --- Dockerfile | 22 +++++++++++++++++----- Jenkinsfile | 2 +- download.yaml | 31 ++++++++++++++++++------------- 3 files changed, 36 insertions(+), 19 deletions(-) diff --git a/Dockerfile b/Dockerfile index 21b796e..8946374 100644 --- a/Dockerfile +++ b/Dockerfile @@ -6,14 +6,14 @@ FROM ${BASE_REGISTRY}/${BASE_IMAGE}:${BASE_TAG} LABEL \ name="innosabi Appserver" \ - maintainer="success@innosabi.com" \ - vendor="innosabi" \ - version="0.0.1" \ + maintainer="fedramp_admin@collaboration.ai" \ + vendor="Collaboration.Ai" \ + version="0.0.2" \ release="0" \ summary="innosabi application server" \ description="Based on php-cli and php-fpm" -ARG VERSION=0.0.1 +ARG VERSION=0.0.2 #COPY LICENSE /licenses/innosabi RUN \ @@ -72,16 +72,25 @@ COPY liblqr.rpm liblqr.rpm COPY ImageMagick-libs.rpm ImageMagick-libs.rpm COPY ImageMagick.rpm ImageMagick.rpm +#Copy application and dependencies +COPY appserver.tar.gz.aes.tar.gz /tmp/appserver.tar.gz.aes.tar.gz +RUN cd /tmp && tar -zxvf appserver.tar.gz.aes.tar.gz && rm appserver.tar.gz.aes.tar.gz + + # Install and clean RUN \ dnf -y install *.rpm && \ - #rm -f *.rpm && \ + rm -f *.rpm && \ dnf -y clean all WORKDIR /opt/ignite RUN mkdir /storage +RUN mv /tmp/composer.lock /opt/ignite +RUN mv /tmp/composer.json /opt/ignite +RUN mv /tmp/appserver.tar.gz.aes /opt/ignite + #COPY version version # Keep this in sync with .gitlab-ci CI change detection @@ -96,6 +105,9 @@ RUN mkdir /storage #COPY docker/appserver/www.ubi.conf /usr/local/etc/php-fpm.d/www.conf #COPY docker/appserver/magic /usr/local/etc/magic +RUN mkdir /run/php-fpm +RUN chown -R apache:apache /run/php-fpm +RUN sed -i 's/listen = \/run\/php-fpm\/www.sock/listen = 9000/g' /etc/php-fpm.d/www.conf ENTRYPOINT [ "/usr/sbin/php-fpm" ] EXPOSE 9000 diff --git a/Jenkinsfile b/Jenkinsfile index c9bb241..617d529 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -1,2 +1,2 @@ @Library('DCCSCR@master') _ -dccscrPipeline( version: "1.0.0" ) +dccscrPipeline( version: "0.0.2" ) diff --git a/download.yaml b/download.yaml index 3d100bd..69cef1b 100644 --- a/download.yaml +++ b/download.yaml @@ -3,7 +3,7 @@ resources: filename: "fedora.gpg" validation: type: "sha256" - value: "33f1409bd6b98ad01cb1bff96e616cf9e67994d0511653941f5ef6733bba4355" + value: "fa8c7bc737685389cb7faed7105b103f2afb3a2b8e329785d3fe3290e522d30e" - url: "https://rpms.remirepo.net/RPM-GPG-KEY-remi2020" filename: "RPM-GPG-KEY-remi2020" validation: @@ -34,11 +34,11 @@ resources: validation: type: "sha256" value: "94cb8dceb47a5b01e3c0542ea3b48601d720325da28e6e6d89ae529e4fddcd97" - - url: "http://mirror.centos.org/centos/8/AppStream/x86_64/os/Packages/pixman-0.36.0-1.el8.x86_64.rpm" + - url: "http://mirror.centos.org/centos/8/AppStream/x86_64/os/Packages/pixman-0.38.4-1.el8.x86_64.rpm" filename: "pixman.rpm" validation: type: "sha256" - value: "3b900b886ed0944ef78cb304db3d4b5290b6677b00e2d729a9e47d9697c753db" + value: "ddbbf3a8191dbc1a9fcb67ccf9cea0d34dbe9bbb74780e1359933cd03ee24451" - url: "http://mirror.centos.org/centos/8/AppStream/x86_64/os/Packages/libXaw-1.0.13-10.el8.x86_64.rpm" filename: "libXaw.rpm" validation: @@ -54,11 +54,11 @@ resources: validation: type: "sha256" value: "a726abbe0829fa1751e84f20f31023f1c761301b0ba543fbd67a0a8070ca33f4" - - url: "http://mirror.centos.org/centos/8/AppStream/x86_64/os/Packages/graphviz-2.40.1-39.el8.x86_64.rpm" + - url: "http://mirror.centos.org/centos/8/AppStream/x86_64/os/Packages/graphviz-2.40.1-40.el8.x86_64.rpm" filename: "graphviz.rpm" validation: type: "sha256" - value: "193efd8d9433c8149a072398efcddc812b83c27109c0f80808ab44f14e5f8232" + value: "b70b6fdaf8fe66a2823d5d415b016acfb0d6f6b6a2a7154820db9ef76e908a90" - url: "http://mirror.centos.org/centos/8/AppStream/x86_64/os/Packages/libwmf-lite-0.2.9-8.el8_0.x86_64.rpm" filename: "libwmf-lite.rpm" validation: @@ -69,26 +69,26 @@ resources: validation: type: "sha256" value: "ed2767829f8545739e9861254cc4c729a43f0e67b981af3102649b4732feaeff" - - url: "https://rpms.remirepo.net/enterprise/8/remi/x86_64/ImageMagick-6.9.11.16-1.el8.remi.x86_64.rpm" + - url: "https://rpms.remirepo.net/enterprise/8/remi/x86_64/ImageMagick-6.9.11.35-1.el8.remi.x86_64.rpm" filename: "ImageMagick.rpm" validation: type: "sha256" - value: "466f0495ab2a8813b724ab0407c26b8ac3d463ea0047b36e6d465be781faf16a" - - url: "https://rpms.remirepo.net/enterprise/8/remi/x86_64/ImageMagick-libs-6.9.11.16-1.el8.remi.x86_64.rpm" + value: "02abb6e7ef15cdf9778b5c8aabfd522f812ccd1dd4b35c3b88729bf201dc7edb" + - url: "https://rpms.remirepo.net/enterprise/8/remi/x86_64/ImageMagick-libs-6.9.11.35-1.el8.remi.x86_64.rpm" filename: "ImageMagick-libs.rpm" validation: type: "sha256" - value: "53b00d0367183bacb5bc91b13735a886eac524b8f1fe2d91b17bb21b8e91bb5e" + value: "84697ac8bce81d4dde853d8ca8c76c95157cf3c7fd089d227fe99d7884346733" - url: "http://mirror.centos.org/centos/8/AppStream/x86_64/os/Packages/cairo-1.15.12-3.el8.x86_64.rpm" filename: "cairo.rpm" validation: type: "sha256" value: "2fcd7a063cab2e103fd4fdf8f4c63d09b9f3d60759c3b0982c75ed9a9e57bdf8" - - url: "http://mirror.centos.org/centos/8/AppStream/x86_64/os/Packages/LibRaw-0.19.1-1.el8.x86_64.rpm" + - url: "http://mirror.centos.org/centos/8/AppStream/x86_64/os/Packages/LibRaw-0.19.5-1.el8.x86_64.rpm" filename: "LibRaw.rpm" validation: type: "sha256" - value: "9a6daed2b960faf38158c717746c499f256c720e2fd08e874750b61117809393" + value: "48684ef90485effe0b63c2d66ec8901f37c800536ad4d08ea6a2c3d40dc5165b" - url: "http://mirror.centos.org/centos/8/AppStream/x86_64/os/Packages/librsvg2-2.42.7-3.el8.x86_64.rpm" filename: "librsvg2.rpm" validation: @@ -109,11 +109,11 @@ resources: validation: type: "sha256" value: "723c0424ce3ec12586d390f2c6d01a2075e9f91543eb5b9a5a998636d49cb3b0" - - url: "https://rpms.remirepo.net/enterprise/8/php72/x86_64/php-pecl-igbinary-3.1.2-1.el8.remi.7.2.x86_64.rpm" + - url: "https://rpms.remirepo.net/enterprise/8/php72/x86_64/php-pecl-igbinary-3.1.5-1.el8.remi.7.2.x86_64.rpm" filename: "php-pecl-igbinary.rpm" validation: type: "sha256" - value: "a7bd097351013b357c1afa7391ff19d24b4440bf6cb03e8525d5cd81d0087ff3" + value: "3ed3272fbaf4534ff98bf66db400d5ae925f71a42665b7d04c6738cbc3f32a59" - url: "https://rpms.remirepo.net/enterprise/8/php72/x86_64/php-pecl-msgpack-2.1.0-1.el8.remi.7.2.x86_64.rpm" filename: "php-pecl-msgpack.rpm" validation: @@ -144,3 +144,8 @@ resources: validation: type: "sha256" value: "8246d152767da7e6dd297599ed4c55b8bde2a5c18e54d97a80d44eb3099d6e89" + - url: "https://gitlab.com/crowdvector/dist/-/raw/feature/distribution/appserver/appserver.tar.gz.aes.tar.gz" + filename: "appserver.tar.gz.aes.tar.gz" + validation: + type: "sha256" + value: "125282343b1c8ae7d2c5d1bfd10fb70b9f84a245b9837a245c74ae2c41f78ca5" -- GitLab From 72ed9da7e46d36886c65bccb371aefac13fe02ef Mon Sep 17 00:00:00 2001 From: Al Fontaine Date: Thu, 12 Nov 2020 14:23:33 +0000 Subject: [PATCH 2/2] Update Dockerfile --- Dockerfile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Dockerfile b/Dockerfile index 8946374..8f1fae7 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,6 +1,6 @@ -ARG BASE_REGISTRY=registry.access.redhat.com -ARG BASE_IMAGE=ubi8 -ARG BASE_TAG=latest +ARG BASE_REGISTRY=registry1.dsop.io +ARG BASE_IMAGE=redhat/ubi/ubi8 +ARG BASE_TAG=8.3 FROM ${BASE_REGISTRY}/${BASE_IMAGE}:${BASE_TAG} -- GitLab