From 5fe6c0dadc4f61d56d9495f3a0f5a261ccb15e6f Mon Sep 17 00:00:00 2001 From: crowdvector Date: Fri, 5 Jun 2020 13:58:37 -0400 Subject: [PATCH 01/14] initial commit --- Dockerfile | 94 +++++++++++++++++++++++++++++++++++++++ LICENSE | 9 ++++ README.md | 9 +++- download.yaml | 121 ++++++++++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 232 insertions(+), 1 deletion(-) create mode 100644 Dockerfile create mode 100644 LICENSE create mode 100644 download.yaml diff --git a/Dockerfile b/Dockerfile new file mode 100644 index 0000000..7ee736c --- /dev/null +++ b/Dockerfile @@ -0,0 +1,94 @@ +ARG BASE_REGISTRY=registry.access.redhat.com +ARG BASE_IMAGE=ubi8 +ARG BASE_TAG=latest + +FROM ${BASE_REGISTRY}/${BASE_IMAGE}:${BASE_TAG} + +LABEL \ + name="innosabi Appserver" \ + maintainer="success@innosabi.com" \ + vendor="innosabi" \ + version="0.0.1" \ + release="0" \ + summary="innosabi application server" \ + description="Based on php-cli and php-fpm" + +ARG VERSION=0.0.1 +#COPY LICENSE /licenses/innosabi + +RUN \ + dnf -y update && \ + dnf -y module install php:7.2/minimal && \ + dnf -y install php-fpm php-json php-mbstring php-xml php-gd php-intl php-ldap php-opcache php-mysqlnd php-dba + +### Memcached Packages + +# Centos +ADD http://mirror.centos.org/centos/8/AppStream/x86_64/os/Packages/libmemcached-libs-1.0.18-15.el8.x86_64.rpm libmemcached-libs.rpm +ADD http://mirror.centos.org/centos/8/AppStream/x86_64/os/Packages/libmemcached-1.0.18-15.el8.x86_64.rpm libmemcached.rpm + +# EPEL +ADD https://download-ib01.fedoraproject.org/pub/epel/8/Everything/x86_64/Packages/f/fastlz-0.1.0-0.12.20070619svnrev12.el8.x86_64.rpm fastlz.rpm + +# Remi +ADD https://rpms.remirepo.net/enterprise/8/php72/x86_64/php-pecl-msgpack-2.1.0-1.el8.remi.7.2.x86_64.rpm php-pecl-msgpack.rpm +ADD https://rpms.remirepo.net/enterprise/8/php72/x86_64/php-pecl-igbinary-3.1.2-1.el8.remi.7.2.x86_64.rpm php-pecl-igbinary.rpm +ADD https://rpms.remirepo.net/enterprise/8/php72/x86_64/php-pecl-memcached-3.1.5-1.el8.remi.7.2.x86_64.rpm php-pecl-memcached.rpm + +### Image Magick Packages + +# Centos +ADD http://mirror.centos.org/centos/8/BaseOS/x86_64/os/Packages/libtool-ltdl-2.4.6-25.el8.x86_64.rpm libtool-ltdl.rpm +ADD http://mirror.centos.org/centos/8/BaseOS/x86_64/os/Packages/gdk-pixbuf2-2.36.12-5.el8.x86_64.rpm gdk-pixbuf2.rpm +ADD http://mirror.centos.org/centos/8/AppStream/x86_64/os/Packages/ilmbase-2.2.0-11.el8.x86_64.rpm ilmbase.rpm +ADD http://mirror.centos.org/centos/8/AppStream/x86_64/os/Packages/pixman-0.36.0-1.el8.x86_64.rpm pixman.rpm +ADD http://mirror.centos.org/centos/8/AppStream/x86_64/os/Packages/cairo-1.15.12-3.el8.x86_64.rpm cairo.rpm +ADD http://mirror.centos.org/centos/8/AppStream/x86_64/os/Packages/graphviz-2.40.1-39.el8.x86_64.rpm graphviz.rpm +ADD http://mirror.centos.org/centos/8/AppStream/x86_64/os/Packages/fftw-libs-double-3.3.5-11.el8.x86_64.rpm fftw-libs-double.rpm +ADD http://mirror.centos.org/centos/8/AppStream/x86_64/os/Packages/LibRaw-0.19.1-1.el8.x86_64.rpm LibRaw.rpm +ADD http://mirror.centos.org/centos/8/AppStream/x86_64/os/Packages/librsvg2-2.42.7-3.el8.x86_64.rpm librsvg2.rpm +ADD http://mirror.centos.org/centos/8/AppStream/x86_64/os/Packages/pango-1.42.4-6.el8.x86_64.rpm pango.rpm +ADD http://mirror.centos.org/centos/8/AppStream/x86_64/os/Packages/libwmf-lite-0.2.9-8.el8_0.x86_64.rpm libwmf-lite.rpm +ADD http://mirror.centos.org/centos/8/AppStream/x86_64/os/Packages/libXaw-1.0.13-10.el8.x86_64.rpm libXaw.rpm +ADD http://mirror.centos.org/centos/8/AppStream/x86_64/os/Packages/xorg-x11-fonts-ISO8859-1-100dpi-7.5-19.el8.noarch.rpm xorg-x11-fonts.rpm + +# EPEL +ADD https://download-ib01.fedoraproject.org/pub/epel/8/Everything/x86_64/Packages/l/libraqm-0.7.0-4.el8.x86_64.rpm libraqm.rpm + +# Remi +ADD https://rpms.remirepo.net/enterprise/8/php72/x86_64/php-pecl-imagick-3.4.4-10.el8.remi.7.2.x86_64.rpm php-pecl-imagick.rpm +ADD https://rpms.remirepo.net/enterprise/8/remi/x86_64/liblqr-1-0.4.2-11.el8.remi.x86_64.rpm liblqr.rpm +ADD https://rpms.remirepo.net/enterprise/8/remi/x86_64/ImageMagick-libs-6.9.11.16-1.el8.remi.x86_64.rpm ImageMagick-libs.rpm +ADD https://rpms.remirepo.net/enterprise/8/remi/x86_64/ImageMagick-6.9.11.16-1.el8.remi.x86_64.rpm ImageMagick.rpm + +# Install and clean +RUN \ + dnf -y install *.rpm && \ + #rm -f *.rpm && \ + dnf -y clean all + + +WORKDIR /opt/ignite +RUN mkdir /storage + +#COPY version version + +# Keep this in sync with .gitlab-ci CI change detection +#COPY ["application", "/opt/ignite/core/application"] +#COPY ["library", "/opt/ignite/core/library"] +#COPY ["bin/cron.php", "bin/crowd.php", "/opt/ignite/core/bin/"] +#COPY ["public/index.php", "/opt/ignite/core/public/"] +#COPY ["bootstrap.php", "composer.json", "composer.lock", "/opt/ignite/core/"] + +#COPY docker/appserver/php.ini /etc/php.ini +#COPY docker/appserver/php-fpm.conf /etc/php-fpm.conf +#COPY docker/appserver/www.ubi.conf /usr/local/etc/php-fpm.d/www.conf +#COPY docker/appserver/magic /usr/local/etc/magic + +ENTRYPOINT [ "/usr/sbin/php-fpm" ] + +EXPOSE 9000 + +# User apache +USER 48 +HEALTHCHECK --timeout=30s CMD which php || exit 1 diff --git a/LICENSE b/LICENSE new file mode 100644 index 0000000..c35164a --- /dev/null +++ b/LICENSE @@ -0,0 +1,9 @@ +LICENSE: COMMERCIAL + +(c) 2001-2020 innosabi, 2020 Collaboration.ai + +You need to acquire a license from innosabi to use this product. This product includes open source software. +The source code of the open source parts and its licenses is included or can be requested. + +innosabi GmbH, Möhlstraße 2, 81675 München +Collaboration.ai, 661 Auburn Avenue NE, Suite 5, Atlanta, GA 30312-1940 diff --git a/README.md b/README.md index aa2e6cc..c35164a 100644 --- a/README.md +++ b/README.md @@ -1,2 +1,9 @@ -# webserver +LICENSE: COMMERCIAL +(c) 2001-2020 innosabi, 2020 Collaboration.ai + +You need to acquire a license from innosabi to use this product. This product includes open source software. +The source code of the open source parts and its licenses is included or can be requested. + +innosabi GmbH, Möhlstraße 2, 81675 München +Collaboration.ai, 661 Auburn Avenue NE, Suite 5, Atlanta, GA 30312-1940 diff --git a/download.yaml b/download.yaml new file mode 100644 index 0000000..a3bde4c --- /dev/null +++ b/download.yaml @@ -0,0 +1,121 @@ +resources: + - url: "https://download-ib01.fedoraproject.org/pub/epel/8/Everything/x86_64/Packages/f/fastlz-0.1.0-0.12.20070619svnrev12.el8.x86_64.rpm" + filename: "fastlz.rpm" + validation: + type: "sha256" + value: "9709ef361090892632cbdbb6002d96b4ab77e8b6dbed4568b215b153eda49e36" + - url: "http://mirror.centos.org/centos/8/BaseOS/x86_64/os/Packages/gdk-pixbuf2-2.36.12-5.el8.x86_64.rpm" + filename: "gdk-pixbuf2.rpm" + 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" + filename: "pixman.rpm" + validation: + type: "sha256" + value: "3b900b886ed0944ef78cb304db3d4b5290b6677b00e2d729a9e47d9697c753db" + - 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: + type: "sha256" + value: "d82ca1d1d9aea848d05ac0ffe889f921a19f37883ae1cf6ba1ca0528e2ab46e4" + - url: "http://mirror.centos.org/centos/8/AppStream/x86_64/os/Packages/ilmbase-2.2.0-11.el8.x86_64.rpm" + filename: "ilmbase.rpm" + validation: + type: "sha256" + value: "ed2e48ad367e08c5f6d0e79c405ff38967506895c0e39209d301d56529f6ddaa" + - url: "https://rpms.remirepo.net/enterprise/8/php72/x86_64/php-pecl-imagick-3.4.4-10.el8.remi.7.2.x86_64.rpm" + filename: "php-pecl-imagick.rpm" + 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" + filename: "graphviz.rpm" + validation: + type: "sha256" + value: "193efd8d9433c8149a072398efcddc812b83c27109c0f80808ab44f14e5f8232" + - 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: + type: "sha256" + value: "e539923a2a5b5f484264007524cf13bf9731c27454784ef2b05d516115cd7bf3" + - url: "http://mirror.centos.org/centos/8/AppStream/x86_64/os/Packages/fftw-libs-double-3.3.5-11.el8.x86_64.rpm" + filename: "fftw-libs-double.rpm" + 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" + 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" + filename: "ImageMagick-libs.rpm" + validation: + type: "sha256" + value: "53b00d0367183bacb5bc91b13735a886eac524b8f1fe2d91b17bb21b8e91bb5e" + - 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" + filename: "LibRaw.rpm" + validation: + type: "sha256" + value: "9a6daed2b960faf38158c717746c499f256c720e2fd08e874750b61117809393" + - 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: + type: "sha256" + value: "a48e9c596f2e36c375d0305b8d224d193881e06bb2b7a828409cf25669c0a24b" + - url: "http://mirror.centos.org/centos/8/BaseOS/x86_64/os/Packages/libtool-ltdl-2.4.6-25.el8.x86_64.rpm" + filename: "libtool-ltdl.rpm" + validation: + type: "sha256" + value: "7dcd11f03fa0979841bf0afe0a2ac8f360502d0a2dee8322a39115595c2464ec" + - url: "https://rpms.remirepo.net/enterprise/8/remi/x86_64/liblqr-1-0.4.2-11.el8.remi.x86_64.rpm" + filename: "liblqr.rpm" + validation: + type: "sha256" + value: "d79bd08cc0580fa3bd0f1c02c5a523403d8655411b4d7b49f7922963839156f4" + - url: "http://mirror.centos.org/centos/8/AppStream/x86_64/os/Packages/xorg-x11-fonts-ISO8859-1-100dpi-7.5-19.el8.noarch.rpm" + filename: "xorg-x11-fonts.rpm" + 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" + filename: "php-pecl-igbinary.rpm" + validation: + type: "sha256" + value: "a7bd097351013b357c1afa7391ff19d24b4440bf6cb03e8525d5cd81d0087ff3" + - 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: + type: "sha256" + value: "cde262304fe7494a2289f017f740ec3aa9fff460cc70b48f710b76ce8e687b1e" + - url: "http://mirror.centos.org/centos/8/AppStream/x86_64/os/Packages/libmemcached-1.0.18-15.el8.x86_64.rpm" + filename: "libmemcached.rpm" + validation: + type: "sha256" + value: "a98237988be726539deb640103644929fcb0a3ffe5a4fcff1d488b866374b253" + - url: "https://download-ib01.fedoraproject.org/pub/epel/8/Everything/x86_64/Packages/l/libraqm-0.7.0-4.el8.x86_64.rpm" + filename: "libraqm.rpm" + validation: + type: "sha256" + value: "c71a88565f0951fac9e9de7ae5f2b5a48aceaf8da6f75d10ebbbb6717bde32fe" + - url: "https://rpms.remirepo.net/enterprise/8/php72/x86_64/php-pecl-memcached-3.1.5-1.el8.remi.7.2.x86_64.rpm" + filename: "php-pecl-memcached.rpm" + validation: + type: "sha256" + value: "d6c4c770ce77eeb52a25adeec3c2515056e99cdeda4822f6cdaca86451e23a3f" + - url: "http://mirror.centos.org/centos/8/AppStream/x86_64/os/Packages/libmemcached-libs-1.0.18-15.el8.x86_64.rpm" + filename: "libmemcached-libs.rpm" + validation: + type: "sha256" + value: "412be2f692dbd7b761ba2cf35f6bbdf5c6af7ad862689f49399e3a176744f870" + - url: "http://mirror.centos.org/centos/8/AppStream/x86_64/os/Packages/pango-1.42.4-6.el8.x86_64.rpm" + filename: "pango.rpm" + validation: + type: "sha256" + value: "8246d152767da7e6dd297599ed4c55b8bde2a5c18e54d97a80d44eb3099d6e89" -- GitLab From 1792593b252a9b3acc9fdd04f2f5c8e550ee08c9 Mon Sep 17 00:00:00 2001 From: crowdvector Date: Fri, 5 Jun 2020 15:02:51 -0400 Subject: [PATCH 02/14] Removed direct downloads --- Dockerfile | 48 ++++++++++++++++++++++++------------------------ 1 file changed, 24 insertions(+), 24 deletions(-) diff --git a/Dockerfile b/Dockerfile index 7ee736c..85d4545 100644 --- a/Dockerfile +++ b/Dockerfile @@ -24,42 +24,42 @@ RUN \ ### Memcached Packages # Centos -ADD http://mirror.centos.org/centos/8/AppStream/x86_64/os/Packages/libmemcached-libs-1.0.18-15.el8.x86_64.rpm libmemcached-libs.rpm -ADD http://mirror.centos.org/centos/8/AppStream/x86_64/os/Packages/libmemcached-1.0.18-15.el8.x86_64.rpm libmemcached.rpm +ADD libmemcached-libs.rpm libmemcached-libs.rpm +ADD libmemcached.rpm libmemcached.rpm # EPEL -ADD https://download-ib01.fedoraproject.org/pub/epel/8/Everything/x86_64/Packages/f/fastlz-0.1.0-0.12.20070619svnrev12.el8.x86_64.rpm fastlz.rpm +ADD fastlz.rpm fastlz.rpm # Remi -ADD https://rpms.remirepo.net/enterprise/8/php72/x86_64/php-pecl-msgpack-2.1.0-1.el8.remi.7.2.x86_64.rpm php-pecl-msgpack.rpm -ADD https://rpms.remirepo.net/enterprise/8/php72/x86_64/php-pecl-igbinary-3.1.2-1.el8.remi.7.2.x86_64.rpm php-pecl-igbinary.rpm -ADD https://rpms.remirepo.net/enterprise/8/php72/x86_64/php-pecl-memcached-3.1.5-1.el8.remi.7.2.x86_64.rpm php-pecl-memcached.rpm +ADD php-pecl-msgpack.rpm php-pecl-msgpack.rpm +ADD php-pecl-igbinary.rpm php-pecl-igbinary.rpm +ADD php-pecl-memcached.rpm php-pecl-memcached.rpm ### Image Magick Packages # Centos -ADD http://mirror.centos.org/centos/8/BaseOS/x86_64/os/Packages/libtool-ltdl-2.4.6-25.el8.x86_64.rpm libtool-ltdl.rpm -ADD http://mirror.centos.org/centos/8/BaseOS/x86_64/os/Packages/gdk-pixbuf2-2.36.12-5.el8.x86_64.rpm gdk-pixbuf2.rpm -ADD http://mirror.centos.org/centos/8/AppStream/x86_64/os/Packages/ilmbase-2.2.0-11.el8.x86_64.rpm ilmbase.rpm -ADD http://mirror.centos.org/centos/8/AppStream/x86_64/os/Packages/pixman-0.36.0-1.el8.x86_64.rpm pixman.rpm -ADD http://mirror.centos.org/centos/8/AppStream/x86_64/os/Packages/cairo-1.15.12-3.el8.x86_64.rpm cairo.rpm -ADD http://mirror.centos.org/centos/8/AppStream/x86_64/os/Packages/graphviz-2.40.1-39.el8.x86_64.rpm graphviz.rpm -ADD http://mirror.centos.org/centos/8/AppStream/x86_64/os/Packages/fftw-libs-double-3.3.5-11.el8.x86_64.rpm fftw-libs-double.rpm -ADD http://mirror.centos.org/centos/8/AppStream/x86_64/os/Packages/LibRaw-0.19.1-1.el8.x86_64.rpm LibRaw.rpm -ADD http://mirror.centos.org/centos/8/AppStream/x86_64/os/Packages/librsvg2-2.42.7-3.el8.x86_64.rpm librsvg2.rpm -ADD http://mirror.centos.org/centos/8/AppStream/x86_64/os/Packages/pango-1.42.4-6.el8.x86_64.rpm pango.rpm -ADD http://mirror.centos.org/centos/8/AppStream/x86_64/os/Packages/libwmf-lite-0.2.9-8.el8_0.x86_64.rpm libwmf-lite.rpm -ADD http://mirror.centos.org/centos/8/AppStream/x86_64/os/Packages/libXaw-1.0.13-10.el8.x86_64.rpm libXaw.rpm -ADD http://mirror.centos.org/centos/8/AppStream/x86_64/os/Packages/xorg-x11-fonts-ISO8859-1-100dpi-7.5-19.el8.noarch.rpm xorg-x11-fonts.rpm +ADD libtool-ltdl.rpm libtool-ltdl.rpm +ADD gdk-pixbuf2.rpm gdk-pixbuf2.rpm +ADD ilmbase.rpm ilmbase.rpm +ADD pixman.rpm pixman.rpm +ADD cairo.rpm cairo.rpm +ADD graphviz.rpm graphviz.rpm +ADD fftw-libs-double.rpm fftw-libs-double.rpm +ADD LibRaw.rpm LibRaw.rpm +ADD librsvg2.rpm librsvg2.rpm +ADD pango.rpm pango.rpm +ADD libwmf-lite.rpm libwmf-lite.rpm +ADD libXaw.rpm libXaw.rpm +ADD xorg-x11-fonts.rpm xorg-x11-fonts.rpm # EPEL -ADD https://download-ib01.fedoraproject.org/pub/epel/8/Everything/x86_64/Packages/l/libraqm-0.7.0-4.el8.x86_64.rpm libraqm.rpm +ADD libraqm.rpm libraqm.rpm # Remi -ADD https://rpms.remirepo.net/enterprise/8/php72/x86_64/php-pecl-imagick-3.4.4-10.el8.remi.7.2.x86_64.rpm php-pecl-imagick.rpm -ADD https://rpms.remirepo.net/enterprise/8/remi/x86_64/liblqr-1-0.4.2-11.el8.remi.x86_64.rpm liblqr.rpm -ADD https://rpms.remirepo.net/enterprise/8/remi/x86_64/ImageMagick-libs-6.9.11.16-1.el8.remi.x86_64.rpm ImageMagick-libs.rpm -ADD https://rpms.remirepo.net/enterprise/8/remi/x86_64/ImageMagick-6.9.11.16-1.el8.remi.x86_64.rpm ImageMagick.rpm +ADD php-pecl-imagick.rpm php-pecl-imagick.rpm +ADD liblqr.rpm liblqr.rpm +ADD ImageMagick-libs.rpm ImageMagick-libs.rpm +ADD ImageMagick.rpm ImageMagick.rpm # Install and clean RUN \ -- GitLab From 3fd669f469ff194c27242886a400c741ac1e1609 Mon Sep 17 00:00:00 2001 From: Al Fontaine Date: Mon, 8 Jun 2020 17:14:10 +0000 Subject: [PATCH 03/14] Add new file --- Jenkinsfile | 2 ++ 1 file changed, 2 insertions(+) create mode 100644 Jenkinsfile diff --git a/Jenkinsfile b/Jenkinsfile new file mode 100644 index 0000000..c9bb241 --- /dev/null +++ b/Jenkinsfile @@ -0,0 +1,2 @@ +@Library('DCCSCR@master') _ +dccscrPipeline( version: "1.0.0" ) -- GitLab From 7952590cfbcd0571b93da23d04785fe8ffc461f2 Mon Sep 17 00:00:00 2001 From: Al Fontaine Date: Mon, 8 Jun 2020 18:02:34 +0000 Subject: [PATCH 04/14] Update download.yaml --- download.yaml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/download.yaml b/download.yaml index a3bde4c..a7cbf19 100644 --- a/download.yaml +++ b/download.yaml @@ -1,4 +1,9 @@ resources: + - url: "http://mirror.centos.org/centos/7/os/x86_64/RPM-GPG-KEY-CentOS-7" + filename: "RPM-GPG-KEY-CentOS-7" + validation: + type: "sha256" + value: "8b48b04b336bd725b9e611c441c65456a4168083c4febc28e88828d8ec14827f" - url: "https://download-ib01.fedoraproject.org/pub/epel/8/Everything/x86_64/Packages/f/fastlz-0.1.0-0.12.20070619svnrev12.el8.x86_64.rpm" filename: "fastlz.rpm" validation: -- GitLab From 71548d18520bec07086a710a7321983fe42a46d0 Mon Sep 17 00:00:00 2001 From: Al Fontaine Date: Mon, 8 Jun 2020 18:04:41 +0000 Subject: [PATCH 05/14] Update Dockerfile --- Dockerfile | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/Dockerfile b/Dockerfile index 85d4545..ca55ce6 100644 --- a/Dockerfile +++ b/Dockerfile @@ -23,6 +23,10 @@ RUN \ ### Memcached Packages +# Add Centos GPG key +COPY RPM-GPG-KEY-CentOS-7 ./tmp +RUN rpm --import /tmp/RPM-GPG-KEY-CentOS-7 + # Centos ADD libmemcached-libs.rpm libmemcached-libs.rpm ADD libmemcached.rpm libmemcached.rpm -- GitLab From ce07e66bd576662aa5b69bf6cf69c4bae2f44b67 Mon Sep 17 00:00:00 2001 From: Al Fontaine Date: Mon, 8 Jun 2020 18:20:05 +0000 Subject: [PATCH 06/14] Update Dockerfile --- Dockerfile | 48 ++++++++++++++++++++++++------------------------ 1 file changed, 24 insertions(+), 24 deletions(-) diff --git a/Dockerfile b/Dockerfile index ca55ce6..4941df6 100644 --- a/Dockerfile +++ b/Dockerfile @@ -28,42 +28,42 @@ COPY RPM-GPG-KEY-CentOS-7 ./tmp RUN rpm --import /tmp/RPM-GPG-KEY-CentOS-7 # Centos -ADD libmemcached-libs.rpm libmemcached-libs.rpm -ADD libmemcached.rpm libmemcached.rpm +COPY libmemcached-libs.rpm libmemcached-libs.rpm +COPY libmemcached.rpm libmemcached.rpm # EPEL -ADD fastlz.rpm fastlz.rpm +COPY fastlz.rpm fastlz.rpm # Remi -ADD php-pecl-msgpack.rpm php-pecl-msgpack.rpm -ADD php-pecl-igbinary.rpm php-pecl-igbinary.rpm -ADD php-pecl-memcached.rpm php-pecl-memcached.rpm +COPY php-pecl-msgpack.rpm php-pecl-msgpack.rpm +COPY php-pecl-igbinary.rpm php-pecl-igbinary.rpm +COPY php-pecl-memcached.rpm php-pecl-memcached.rpm ### Image Magick Packages # Centos -ADD libtool-ltdl.rpm libtool-ltdl.rpm -ADD gdk-pixbuf2.rpm gdk-pixbuf2.rpm -ADD ilmbase.rpm ilmbase.rpm -ADD pixman.rpm pixman.rpm -ADD cairo.rpm cairo.rpm -ADD graphviz.rpm graphviz.rpm -ADD fftw-libs-double.rpm fftw-libs-double.rpm -ADD LibRaw.rpm LibRaw.rpm -ADD librsvg2.rpm librsvg2.rpm -ADD pango.rpm pango.rpm -ADD libwmf-lite.rpm libwmf-lite.rpm -ADD libXaw.rpm libXaw.rpm -ADD xorg-x11-fonts.rpm xorg-x11-fonts.rpm +COPY libtool-ltdl.rpm libtool-ltdl.rpm +COPY gdk-pixbuf2.rpm gdk-pixbuf2.rpm +COPY ilmbase.rpm ilmbase.rpm +COPY pixman.rpm pixman.rpm +COPY cairo.rpm cairo.rpm +COPY graphviz.rpm graphviz.rpm +COPY fftw-libs-double.rpm fftw-libs-double.rpm +COPY LibRaw.rpm LibRaw.rpm +COPY librsvg2.rpm librsvg2.rpm +COPY pango.rpm pango.rpm +COPY libwmf-lite.rpm libwmf-lite.rpm +COPY libXaw.rpm libXaw.rpm +COPY xorg-x11-fonts.rpm xorg-x11-fonts.rpm # EPEL -ADD libraqm.rpm libraqm.rpm +COPY libraqm.rpm libraqm.rpm # Remi -ADD php-pecl-imagick.rpm php-pecl-imagick.rpm -ADD liblqr.rpm liblqr.rpm -ADD ImageMagick-libs.rpm ImageMagick-libs.rpm -ADD ImageMagick.rpm ImageMagick.rpm +COPY php-pecl-imagick.rpm php-pecl-imagick.rpm +COPY liblqr.rpm liblqr.rpm +COPY ImageMagick-libs.rpm ImageMagick-libs.rpm +COPY ImageMagick.rpm ImageMagick.rpm # Install and clean RUN \ -- GitLab From 67d8d896fd5bcdfd2320e3b88cf9eeb6042fab18 Mon Sep 17 00:00:00 2001 From: Al Fontaine Date: Mon, 8 Jun 2020 18:47:18 +0000 Subject: [PATCH 07/14] Update download.yaml --- download.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/download.yaml b/download.yaml index a7cbf19..ba3beb8 100644 --- a/download.yaml +++ b/download.yaml @@ -1,9 +1,9 @@ resources: - - url: "http://mirror.centos.org/centos/7/os/x86_64/RPM-GPG-KEY-CentOS-7" - filename: "RPM-GPG-KEY-CentOS-7" + - url: "https://www.centos.org/keys/RPM-GPG-KEY-CentOS-Official" + filename: "RPM-GPG-KEY-CentOS-Official" validation: type: "sha256" - value: "8b48b04b336bd725b9e611c441c65456a4168083c4febc28e88828d8ec14827f" + value: "146059788b214d7ba0dd70c1cf21111e594c6cfde201da8a9a88fe7101be8a78" - url: "https://download-ib01.fedoraproject.org/pub/epel/8/Everything/x86_64/Packages/f/fastlz-0.1.0-0.12.20070619svnrev12.el8.x86_64.rpm" filename: "fastlz.rpm" validation: -- GitLab From 92d793389070f4b01ac1f02ed7c90557d57fa954 Mon Sep 17 00:00:00 2001 From: Al Fontaine Date: Mon, 8 Jun 2020 18:47:48 +0000 Subject: [PATCH 08/14] Update Dockerfile --- Dockerfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index 4941df6..4cf3c11 100644 --- a/Dockerfile +++ b/Dockerfile @@ -24,8 +24,8 @@ RUN \ ### Memcached Packages # Add Centos GPG key -COPY RPM-GPG-KEY-CentOS-7 ./tmp -RUN rpm --import /tmp/RPM-GPG-KEY-CentOS-7 +COPY RPM-GPG-KEY-CentOS-Official ./tmp +RUN rpm --import /tmp/RPM-GPG-KEY-CentOS-Official # Centos COPY libmemcached-libs.rpm libmemcached-libs.rpm -- GitLab From 33fc01c435fe3c530a36b79fa7e629100f5dfe39 Mon Sep 17 00:00:00 2001 From: Al Fontaine Date: Mon, 8 Jun 2020 19:23:02 +0000 Subject: [PATCH 09/14] Update download.yaml --- download.yaml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/download.yaml b/download.yaml index ba3beb8..716a66f 100644 --- a/download.yaml +++ b/download.yaml @@ -1,4 +1,9 @@ resources: + - url: "https://rpms.remirepo.net/RPM-GPG-KEY-remi2020" + filename: "RPM-GPG-KEY-remi2020" + validation: + type: "sha256" + value: "0483c1e7a7bf6bf6fe62882585d3bb9d903656ad020dd7045f2d496229c01959" - url: "https://www.centos.org/keys/RPM-GPG-KEY-CentOS-Official" filename: "RPM-GPG-KEY-CentOS-Official" validation: -- GitLab From b2ba609fb6992789cf5ee7d7ed2742386025e6e4 Mon Sep 17 00:00:00 2001 From: Al Fontaine Date: Mon, 8 Jun 2020 19:24:26 +0000 Subject: [PATCH 10/14] Update Dockerfile --- Dockerfile | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 4cf3c11..982e5db 100644 --- a/Dockerfile +++ b/Dockerfile @@ -24,7 +24,7 @@ RUN \ ### Memcached Packages # Add Centos GPG key -COPY RPM-GPG-KEY-CentOS-Official ./tmp +COPY RPM-GPG-KEY-CentOS-Official /tmp RUN rpm --import /tmp/RPM-GPG-KEY-CentOS-Official # Centos @@ -34,6 +34,10 @@ COPY libmemcached.rpm libmemcached.rpm # EPEL COPY fastlz.rpm fastlz.rpm +# Add Remi GPG key +COPY RPM-GPG-KEY-remi2020 /tmp +RUN rpm --import /tmp/RPM-GPG-KEY-remi2020 + # Remi COPY php-pecl-msgpack.rpm php-pecl-msgpack.rpm COPY php-pecl-igbinary.rpm php-pecl-igbinary.rpm -- GitLab From 69f01cf83335c0528a93bfda3729d9969fe4034b Mon Sep 17 00:00:00 2001 From: Al Fontaine Date: Mon, 8 Jun 2020 19:56:45 +0000 Subject: [PATCH 11/14] Update download.yaml --- download.yaml | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/download.yaml b/download.yaml index 716a66f..20cbeb1 100644 --- a/download.yaml +++ b/download.yaml @@ -4,6 +4,16 @@ resources: validation: type: "sha256" value: "0483c1e7a7bf6bf6fe62882585d3bb9d903656ad020dd7045f2d496229c01959" + - url: "https://rpms.remirepo.net/RPM-GPG-KEY-remi2019" + filename: "RPM-GPG-KEY-remi2019" + validation: + type: "sha256" + value: "bba72d91ef180f18d3e7626a36ddd605d6f82ae31ce37802498b05d5444f52bb" + - url: "https://rpms.remirepo.net/RPM-GPG-KEY-remi2018" + filename: "RPM-GPG-KEY-remi2018" + validation: + type: "sha256" + value: "01992da5a631f40d0c733441f8623e0ceddcb98541b70ad528c51f04877875fb" - url: "https://www.centos.org/keys/RPM-GPG-KEY-CentOS-Official" filename: "RPM-GPG-KEY-CentOS-Official" validation: -- GitLab From 8bcd0e764e03cf428387371dea082b55c477af75 Mon Sep 17 00:00:00 2001 From: Al Fontaine Date: Mon, 8 Jun 2020 19:58:43 +0000 Subject: [PATCH 12/14] Update Dockerfile --- Dockerfile | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index 982e5db..e117557 100644 --- a/Dockerfile +++ b/Dockerfile @@ -35,8 +35,10 @@ COPY libmemcached.rpm libmemcached.rpm COPY fastlz.rpm fastlz.rpm # Add Remi GPG key -COPY RPM-GPG-KEY-remi2020 /tmp -RUN rpm --import /tmp/RPM-GPG-KEY-remi2020 +COPY RPM-GPG-KEY-remi2020 RPM-GPG-KEY-remi2019 RPM-GPG-KEY-remi2018 /tmp/ +RUN rpm --import /tmp/RPM-GPG-KEY-remi2020 && \ + rpm --import /tmp/RPM-GPG-KEY-remi2019 && \ + rpm --import /tmp/RPM-GPG-KEY-remi2018 # Remi COPY php-pecl-msgpack.rpm php-pecl-msgpack.rpm -- GitLab From fb313a13a1acf9683e77dbf059d6b8f236f508b0 Mon Sep 17 00:00:00 2001 From: Al Fontaine Date: Mon, 8 Jun 2020 20:18:19 +0000 Subject: [PATCH 13/14] Update download.yaml --- download.yaml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/download.yaml b/download.yaml index 20cbeb1..3d100bd 100644 --- a/download.yaml +++ b/download.yaml @@ -1,4 +1,9 @@ resources: + - url: "https://getfedora.org/static/fedora.gpg" + filename: "fedora.gpg" + validation: + type: "sha256" + value: "33f1409bd6b98ad01cb1bff96e616cf9e67994d0511653941f5ef6733bba4355" - url: "https://rpms.remirepo.net/RPM-GPG-KEY-remi2020" filename: "RPM-GPG-KEY-remi2020" validation: -- GitLab From 3afccb580b95ffda057267bceb67e96712b77c98 Mon Sep 17 00:00:00 2001 From: Al Fontaine Date: Mon, 8 Jun 2020 20:18:56 +0000 Subject: [PATCH 14/14] Update Dockerfile --- Dockerfile | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index e117557..21b796e 100644 --- a/Dockerfile +++ b/Dockerfile @@ -35,10 +35,11 @@ COPY libmemcached.rpm libmemcached.rpm COPY fastlz.rpm fastlz.rpm # Add Remi GPG key -COPY RPM-GPG-KEY-remi2020 RPM-GPG-KEY-remi2019 RPM-GPG-KEY-remi2018 /tmp/ +COPY RPM-GPG-KEY-remi2020 RPM-GPG-KEY-remi2019 RPM-GPG-KEY-remi2018 fedora.gpg /tmp/ RUN rpm --import /tmp/RPM-GPG-KEY-remi2020 && \ rpm --import /tmp/RPM-GPG-KEY-remi2019 && \ - rpm --import /tmp/RPM-GPG-KEY-remi2018 + rpm --import /tmp/RPM-GPG-KEY-remi2018 && \ + rpm --import /tmp/fedora.gpg # Remi COPY php-pecl-msgpack.rpm php-pecl-msgpack.rpm -- GitLab