From c991462e49b0b0f09e6775c3c7cdcad8bb30d8dd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E2=80=9Ccrowdvector=E2=80=9D?= Date: Mon, 16 Nov 2020 16:09:38 -0500 Subject: [PATCH 1/2] Upgrading php to 7.3 --- Dockerfile | 16 ++++++++++------ download.yaml | 24 ++++++++++++------------ 2 files changed, 22 insertions(+), 18 deletions(-) diff --git a/Dockerfile b/Dockerfile index 8f1fae7..c7b96f9 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,6 +1,10 @@ -ARG BASE_REGISTRY=registry1.dsop.io -ARG BASE_IMAGE=redhat/ubi/ubi8 -ARG BASE_TAG=8.3 +#ARG BASE_REGISTRY=registry1.dsop.io +#ARG BASE_IMAGE=redhat/ubi/ubi8 +#ARG BASE_TAG=8.3 + +ARG BASE_REGISTRY=registry.access.redhat.com +ARG BASE_IMAGE=ubi8 +ARG BASE_TAG=latest FROM ${BASE_REGISTRY}/${BASE_IMAGE}:${BASE_TAG} @@ -8,17 +12,17 @@ LABEL \ name="innosabi Appserver" \ maintainer="fedramp_admin@collaboration.ai" \ vendor="Collaboration.Ai" \ - version="0.0.2" \ + version="0.0.3" \ release="0" \ summary="innosabi application server" \ description="Based on php-cli and php-fpm" -ARG VERSION=0.0.2 +ARG VERSION=0.0.3 #COPY LICENSE /licenses/innosabi RUN \ dnf -y update && \ - dnf -y module install php:7.2/minimal && \ + dnf -y module install php:7.3/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 diff --git a/download.yaml b/download.yaml index 69cef1b..8fa3d8b 100644 --- a/download.yaml +++ b/download.yaml @@ -49,11 +49,11 @@ resources: 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" + - url: "https://rpms.remirepo.net/enterprise/8/php73/x86_64/php-pecl-imagick-3.4.4-10.el8.remi.7.3.x86_64.rpm" filename: "php-pecl-imagick.rpm" validation: type: "sha256" - value: "a726abbe0829fa1751e84f20f31023f1c761301b0ba543fbd67a0a8070ca33f4" + value: "4c65f8fa3421e96664a8c226248b0495a26adeb2bdd004170665ad7ae50b0b0b" - 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: @@ -69,16 +69,16 @@ resources: validation: type: "sha256" value: "ed2767829f8545739e9861254cc4c729a43f0e67b981af3102649b4732feaeff" - - url: "https://rpms.remirepo.net/enterprise/8/remi/x86_64/ImageMagick-6.9.11.35-1.el8.remi.x86_64.rpm" + - url: "https://rpms.remirepo.net/enterprise/8/remi/x86_64/ImageMagick-6.9.11.38-1.el8.remi.x86_64.rpm" filename: "ImageMagick.rpm" validation: type: "sha256" - value: "02abb6e7ef15cdf9778b5c8aabfd522f812ccd1dd4b35c3b88729bf201dc7edb" - - url: "https://rpms.remirepo.net/enterprise/8/remi/x86_64/ImageMagick-libs-6.9.11.35-1.el8.remi.x86_64.rpm" + value: "16788e6b520775da88e90d33d5a059dedaf7d9cb58577909910fa25e32d94121" + - url: "https://rpms.remirepo.net/enterprise/8/remi/x86_64/ImageMagick-libs-6.9.11.38-1.el8.remi.x86_64.rpm" filename: "ImageMagick-libs.rpm" validation: type: "sha256" - value: "84697ac8bce81d4dde853d8ca8c76c95157cf3c7fd089d227fe99d7884346733" + value: "bfe0e0a7f6e2f48fed6b472174539aca5cc4431ea1283e045254f1373171e99d" - 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: @@ -109,16 +109,16 @@ resources: validation: type: "sha256" value: "723c0424ce3ec12586d390f2c6d01a2075e9f91543eb5b9a5a998636d49cb3b0" - - url: "https://rpms.remirepo.net/enterprise/8/php72/x86_64/php-pecl-igbinary-3.1.5-1.el8.remi.7.2.x86_64.rpm" + - url: "https://rpms.remirepo.net/enterprise/8/php73/x86_64/php-pecl-igbinary-3.1.6-1.el8.remi.7.3.x86_64.rpm" filename: "php-pecl-igbinary.rpm" validation: type: "sha256" - 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" + value: "40451064b4c3075573081902d0cfb42a5ab8f12f53f91a764e95b12da8e8ca3a" + - url: "https://rpms.remirepo.net/enterprise/8/php73/x86_64/php-pecl-msgpack-2.1.1-1.el8.remi.7.3.x86_64.rpm" filename: "php-pecl-msgpack.rpm" validation: type: "sha256" - value: "cde262304fe7494a2289f017f740ec3aa9fff460cc70b48f710b76ce8e687b1e" + value: "f6a1f7a29bd99d10932ac7a7a7fd7f7cae83e4b1a1e076979a1ca1c8e063bb2a" - 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: @@ -129,11 +129,11 @@ resources: 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" + - url: "https://rpms.remirepo.net/enterprise/8/php73/x86_64/php-pecl-memcached-3.1.5-1.el8.remi.7.3.x86_64.rpm" filename: "php-pecl-memcached.rpm" validation: type: "sha256" - value: "d6c4c770ce77eeb52a25adeec3c2515056e99cdeda4822f6cdaca86451e23a3f" + value: "e35fc7c08150ef638810a1a2dce19c06545ed575b0737a4aa0ec19347584170a" - 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: -- GitLab From a94b743ba56ab21d352cdce45eaf141e9880d7a9 Mon Sep 17 00:00:00 2001 From: Al Fontaine Date: Mon, 16 Nov 2020 21:38:53 +0000 Subject: [PATCH 2/2] Update Dockerfile --- Dockerfile | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/Dockerfile b/Dockerfile index c7b96f9..96dbdab 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,10 +1,6 @@ -#ARG BASE_REGISTRY=registry1.dsop.io -#ARG BASE_IMAGE=redhat/ubi/ubi8 -#ARG BASE_TAG=8.3 - -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