From 4845c967d517d72e178c67cf193aa9486ead397a Mon Sep 17 00:00:00 2001 From: ironbank-bot Date: Thu, 10 Dec 2020 01:17:08 +0000 Subject: [PATCH 1/4] Migrate to hardening_manifest.yaml --- Dockerfile | 6 ---- Jenkinsfile | 2 -- download.yaml | 23 ------------- hardening_manifest.yaml | 73 +++++++++++++++++++++++++++++++++++++++++ renovate.json | 38 ++++++++++++++++----- 5 files changed, 103 insertions(+), 39 deletions(-) delete mode 100644 Jenkinsfile delete mode 100644 download.yaml create mode 100644 hardening_manifest.yaml diff --git a/Dockerfile b/Dockerfile index 1274f67..a02bfcd 100644 --- a/Dockerfile +++ b/Dockerfile @@ -71,12 +71,6 @@ RUN dnf update --setopt=tsflags=nodocs -y \ FROM ${BASE_REGISTRY}/${BASE_IMAGE}:${BASE_TAG} -LABEL org.opencontainers.image.title="php" \ - org.opencontainers.image.description="PHP is a popular general-purpose scripting language that is especially suited to web development." \ - org.opencontainers.image.licenses="PHP-3.01" \ - org.opencontainers.image.url="https://www.php.net/" \ - org.opencontainers.image.version="7.3.25" \ - maintainer="cht@dsop.io" ENV PHP_INI_PATH=/usr/local/etc/php RUN mkdir -p ${PHP_INI_PATH}/conf.d /usr/local/etc/php-fpm.d /usr/local/var/log/php-fpm \ && chown -R 1001:1001 /usr/local/var/log/php-fpm/ \ diff --git a/Jenkinsfile b/Jenkinsfile deleted file mode 100644 index b6a0c0c..0000000 --- a/Jenkinsfile +++ /dev/null @@ -1,2 +0,0 @@ -@Library('DCCSCR@master') _ -dccscrPipeline(version: '7.3.25') diff --git a/download.yaml b/download.yaml deleted file mode 100644 index b5dad1a..0000000 --- a/download.yaml +++ /dev/null @@ -1,23 +0,0 @@ -resources: - - url: "https://github.com/php/php-src/archive/php-7.3.25.tar.gz" - filename: "php.tar.gz" - validation: - type: "sha256" - value: "4c7599a3e8005630824823e67b36b1b482728a81606be1e9955ce0cb178aaa86" - - url: "https://github.com/jedisct1/libsodium/releases/download/1.0.18-RELEASE/libsodium-1.0.18.tar.gz" - filename: "libsodium.tar.gz" - validation: - type: "sha256" - value: "6f504490b342a4f8a4c4a02fc9b866cbef8622d5df4e5452b46be121e46636c1" - - url: "http://ftp.gnu.org/gnu/bison/bison-3.5.4.tar.gz" - filename: "bison.tar.gz" - validation: - type: "sha256" - value: "c0dd154dfaba63553a892d41dc400c7baa88cc06a1e2e27813fdd503715e4c28" - - url: "https://ftp.gnu.org/gnu/texinfo/texinfo-6.7.tar.gz" - filename: "textinfo.tar.gz" - validation: - type: "sha256" - value: "a52d05076b90032cb2523673c50e53185938746482cf3ca0213e9b4b50ac2d3e" - - diff --git a/hardening_manifest.yaml b/hardening_manifest.yaml new file mode 100644 index 0000000..b86ae14 --- /dev/null +++ b/hardening_manifest.yaml @@ -0,0 +1,73 @@ +--- +apiVersion: v1 + +# The repository name in registry1, excluding /ironbank/ +name: "opensource/php/php73" + +# List of tags to push for the repository in registry1 +# The most specific version should be the first tag and will be shown +# on ironbank.dsop.io +tags: +- "7.3.25" +- "latest" + +# Build args passed to Dockerfile ARGs +args: + BASE_IMAGE: "redhat/ubi/ubi8" + BASE_TAG: "8.3" + +# Docker image labels +labels: + org.opencontainers.image.title: "php73" + ## Human-readable description of the software packaged in the image + # org.opencontainers.image.description: "FIXME" + ## License(s) under which contained software is distributed + # org.opencontainers.image.licenses: "FIXME" + ## URL to find more information on the image + # org.opencontainers.image.url: "FIXME" + ## Name of the distributing entity, organization or individual + # org.opencontainers.image.vendor: "FIXME" + org.opencontainers.image.version: "7.3.25" + ## Keywords to help with search (ex. "cicd,gitops,golang") + # mil.dso.ironbank.image.keywords: "FIXME" + ## This value can be "opensource" or "commercial" + # mil.dso.ironbank.image.type: "FIXME" + ## Product the image belongs to for grouping multiple images + # mil.dso.ironbank.product.name: "FIXME" + +# List of resources to make available to the offline build context +resources: +- filename: php.tar.gz + url: https://github.com/php/php-src/archive/php-7.3.25.tar.gz + validation: + type: sha256 + value: 4c7599a3e8005630824823e67b36b1b482728a81606be1e9955ce0cb178aaa86 +- filename: libsodium.tar.gz + url: https://github.com/jedisct1/libsodium/releases/download/1.0.18-RELEASE/libsodium-1.0.18.tar.gz + validation: + type: sha256 + value: 6f504490b342a4f8a4c4a02fc9b866cbef8622d5df4e5452b46be121e46636c1 +- filename: bison.tar.gz + url: http://ftp.gnu.org/gnu/bison/bison-3.5.4.tar.gz + validation: + type: sha256 + value: c0dd154dfaba63553a892d41dc400c7baa88cc06a1e2e27813fdd503715e4c28 +- filename: textinfo.tar.gz + url: https://ftp.gnu.org/gnu/texinfo/texinfo-6.7.tar.gz + validation: + type: sha256 + value: a52d05076b90032cb2523673c50e53185938746482cf3ca0213e9b4b50ac2d3e + +# List of project maintainers +# FIXME: Fill in the following details for the current container owner in the whitelist +# FIXME: Include any other vendor information if applicable +maintainers: +- email: "seagren.tim@solute.us" +# # The name of the current container owner +# name: "FIXME" +# # The gitlab username of the current container owner +# username: "FIXME" +# cht_member: true # FIXME: Uncomment if the maintainer is a member of CHT +# - name: "FIXME" +# username: "FIXME" +# email: "FIXME" diff --git a/renovate.json b/renovate.json index adeda58..c241b89 100644 --- a/renovate.json +++ b/renovate.json @@ -1,10 +1,18 @@ { - "assignees": ["@seagren.tim"], - "baseBranches": ["development"], + "assignees": [ + "@seagren.tim" + ], + "baseBranches": [ + "development" + ], "packageRules": [ { - "datasources": ["github-releases"], - "packageNames": ["php/php-src"], + "datasources": [ + "github-releases" + ], + "packageNames": [ + "php/php-src" + ], "separateMinorPatch": true, "minor": { "enabled": false @@ -13,7 +21,9 @@ ], "regexManagers": [ { - "fileMatch": ["^Dockerfile$"], + "fileMatch": [ + "^Dockerfile$" + ], "matchStrings": [ "version=\"(?.*?)\"" ], @@ -21,12 +31,24 @@ "datasourceTemplate": "github-releases" }, { - "fileMatch": ["^Jenkinsfile$"], + "fileMatch": [ + "^hardening_manifest.yaml$" + ], + "matchStrings": [ + "org\\.opencontainers\\.image\\.version:\\s+\"(?.+?)\"" + ], + "depNameTemplate": "php/php-src", + "datasourceTemplate": "github-releases" + }, + { + "fileMatch": [ + "^hardening_manifest.yaml$" + ], "matchStrings": [ - "version:\\s+\"(?.*?)\"" + "tags:\\s+-\\s+\"(?.+?)\"" ], "depNameTemplate": "php/php-src", "datasourceTemplate": "github-releases" } ] -} +} \ No newline at end of file -- GitLab From fdc7da334f9c6fb52d662a6ba9c8b3615b3d0f00 Mon Sep 17 00:00:00 2001 From: jweatherford Date: Tue, 29 Dec 2020 13:00:40 -0500 Subject: [PATCH 2/4] hardening manifest migration --- hardening_manifest.yaml | 43 ++++++++++++++++++----------------------- 1 file changed, 19 insertions(+), 24 deletions(-) diff --git a/hardening_manifest.yaml b/hardening_manifest.yaml index b86ae14..6c7ed35 100644 --- a/hardening_manifest.yaml +++ b/hardening_manifest.yaml @@ -19,21 +19,21 @@ args: # Docker image labels labels: org.opencontainers.image.title: "php73" - ## Human-readable description of the software packaged in the image - # org.opencontainers.image.description: "FIXME" - ## License(s) under which contained software is distributed - # org.opencontainers.image.licenses: "FIXME" - ## URL to find more information on the image - # org.opencontainers.image.url: "FIXME" - ## Name of the distributing entity, organization or individual - # org.opencontainers.image.vendor: "FIXME" + # Human-readable description of the software packaged in the image + org.opencontainers.image.description: "PHP is a popular general-purpose scripting language that is especially suited to web development." + # License(s) under which contained software is distributed + org.opencontainers.image.licenses: "PHP-3.01" + # URL to find more information on the image + org.opencontainers.image.url: "https://www.php.net/" + # Name of the distributing entity, organization or individual + org.opencontainers.image.vendor: "The PHP Group" org.opencontainers.image.version: "7.3.25" - ## Keywords to help with search (ex. "cicd,gitops,golang") - # mil.dso.ironbank.image.keywords: "FIXME" - ## This value can be "opensource" or "commercial" - # mil.dso.ironbank.image.type: "FIXME" - ## Product the image belongs to for grouping multiple images - # mil.dso.ironbank.product.name: "FIXME" + # Keywords to help with search (ex. "cicd,gitops,golang") + mil.dso.ironbank.image.keywords: "FIXME" + # This value can be "opensource" or "commercial" + mil.dso.ironbank.image.type: "opensource" + # Product the image belongs to for grouping multiple images + mil.dso.ironbank.product.name: "php" # List of resources to make available to the offline build context resources: @@ -59,15 +59,10 @@ resources: value: a52d05076b90032cb2523673c50e53185938746482cf3ca0213e9b4b50ac2d3e # List of project maintainers -# FIXME: Fill in the following details for the current container owner in the whitelist -# FIXME: Include any other vendor information if applicable maintainers: - email: "seagren.tim@solute.us" -# # The name of the current container owner -# name: "FIXME" -# # The gitlab username of the current container owner -# username: "FIXME" -# cht_member: true # FIXME: Uncomment if the maintainer is a member of CHT -# - name: "FIXME" -# username: "FIXME" -# email: "FIXME" + # The name of the current container owner + name: "Tim Seagren" + # The gitlab username of the current container owner + username: "seagren.tim" + cht_member: true -- GitLab From 7668ebec4823fb24a1e687b97f21cfe32fc3878d Mon Sep 17 00:00:00 2001 From: Adam Martin Date: Fri, 9 Apr 2021 20:21:12 +0000 Subject: [PATCH 3/4] Update to php 7.3.27 --- hardening_manifest.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/hardening_manifest.yaml b/hardening_manifest.yaml index 6c7ed35..a468979 100644 --- a/hardening_manifest.yaml +++ b/hardening_manifest.yaml @@ -8,7 +8,7 @@ name: "opensource/php/php73" # The most specific version should be the first tag and will be shown # on ironbank.dsop.io tags: -- "7.3.25" +- "7.3.27" - "latest" # Build args passed to Dockerfile ARGs @@ -27,7 +27,7 @@ labels: org.opencontainers.image.url: "https://www.php.net/" # Name of the distributing entity, organization or individual org.opencontainers.image.vendor: "The PHP Group" - org.opencontainers.image.version: "7.3.25" + org.opencontainers.image.version: "7.3.27" # Keywords to help with search (ex. "cicd,gitops,golang") mil.dso.ironbank.image.keywords: "FIXME" # This value can be "opensource" or "commercial" @@ -38,7 +38,7 @@ labels: # List of resources to make available to the offline build context resources: - filename: php.tar.gz - url: https://github.com/php/php-src/archive/php-7.3.25.tar.gz + url: https://github.com/php/php-src/archive/php-7.3.27.tar.gz validation: type: sha256 value: 4c7599a3e8005630824823e67b36b1b482728a81606be1e9955ce0cb178aaa86 -- GitLab From 75a2bf35cc39e67cbc38e715e33310fda23089b1 Mon Sep 17 00:00:00 2001 From: Adam Martin Date: Fri, 9 Apr 2021 20:25:28 +0000 Subject: [PATCH 4/4] Update php 7.3.27 with corrected sha on new tar --- hardening_manifest.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hardening_manifest.yaml b/hardening_manifest.yaml index a468979..f254815 100644 --- a/hardening_manifest.yaml +++ b/hardening_manifest.yaml @@ -41,7 +41,7 @@ resources: url: https://github.com/php/php-src/archive/php-7.3.27.tar.gz validation: type: sha256 - value: 4c7599a3e8005630824823e67b36b1b482728a81606be1e9955ce0cb178aaa86 + value: d46f4ab1cb058f433c68ea2b92b2841aa22e20a62237304a3df453f5d7c964ab - filename: libsodium.tar.gz url: https://github.com/jedisct1/libsodium/releases/download/1.0.18-RELEASE/libsodium-1.0.18.tar.gz validation: -- GitLab