From 3799375423f8dd321e3e8ecbfdfb44d31c627a38 Mon Sep 17 00:00:00 2001 From: Zachary Sanders Date: Fri, 21 May 2021 19:54:37 +0000 Subject: [PATCH 1/7] renovate-automerge --- renovate.json | 2 ++ 1 file changed, 2 insertions(+) diff --git a/renovate.json b/renovate.json index e319a1b..a9406b8 100644 --- a/renovate.json +++ b/renovate.json @@ -5,6 +5,8 @@ "baseBranches": [ "development" ], + "automerge": true, + "gitLabAutomerge": true, "regexManagers": [ { "fileMatch": [ -- GitLab From 2b2002b7fe22ccf5857819e9bc753e89fdf1670f Mon Sep 17 00:00:00 2001 From: renovate Date: Wed, 18 Aug 2021 18:36:06 +0000 Subject: [PATCH 2/7] Update gcr.io/spark-operator/spark-py Docker tag to v3 --- hardening_manifest.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/hardening_manifest.yaml b/hardening_manifest.yaml index 33e341d..480829d 100644 --- a/hardening_manifest.yaml +++ b/hardening_manifest.yaml @@ -8,7 +8,7 @@ name: "opensource/spark-operator/spark-py" # The most specific version should be the first tag and will be shown # on ironbank.dsop.io tags: -- "v2.4.5" +- "v3.1.1" - "latest" # Build args passed to Dockerfile ARGs @@ -27,7 +27,7 @@ labels: org.opencontainers.image.url: "https://spark.apache.org/docs/latest/index.html" # Name of the distributing entity, organization or individual org.opencontainers.image.vendor: "Apache Software Foundation" - org.opencontainers.image.version: "v2.4.5" + org.opencontainers.image.version: "v3.1.1" # Keywords to help with search (ex. "cicd,gitops,golang") mil.dso.ironbank.image.keywords: "apache,python,data processing,large scale,hadoop,kubeflow" # This value can be "opensource" or "commercial" -- GitLab From 50c06ade64ffba2ad96536ba1d6d8f308d006afd Mon Sep 17 00:00:00 2001 From: renovate Date: Thu, 19 Aug 2021 01:04:22 +0000 Subject: [PATCH 3/7] Update dependency pip to v21.2.4 --- hardening_manifest.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/hardening_manifest.yaml b/hardening_manifest.yaml index 480829d..4622706 100644 --- a/hardening_manifest.yaml +++ b/hardening_manifest.yaml @@ -39,11 +39,11 @@ labels: resources: - url: "docker://gcr.io/spark-operator/spark-py@sha256:c1f21b8b6f4f0ad7b25177ad086b7eaf7d96747940b0fe2e8dc6ca688c85db76" tag: "spark-operator/spark-py:2.4.5" - - filename: pip-21.1.1-py3-none-any.whl - url: https://files.pythonhosted.org/packages/cd/6f/43037c7bcc8bd8ba7c9074256b1a11596daa15555808ec748048c1507f08/pip-21.1.1-py3-none-any.whl + - filename: pip-21.2.4-py3-none-any.whl + url: https://files.pythonhosted.org/packages/ca/31/b88ef447d595963c01060998cb329251648acf4a067721b0452c45527eb8/pip-21.2.4-py3-none-any.whl validation: type: sha256 - value: 11d095ed5c15265fc5c15cc40a45188675c239fb0f9913b673a33e54ff7d45f0 + value: fa9ebb85d3fd607617c0c44aca302b1b45d87f9c2a1649b46c26167ca4296323 - filename: setuptools-53.0.0-py3-none-any.whl url: https://files.pythonhosted.org/packages/15/0e/255e3d57965f318973e417d5b7034223f1223de500d91b945ddfaef42a37/setuptools-53.0.0-py3-none-any.whl validation: -- GitLab From 4e160834242ce80c34201ba5c917d3132a048404 Mon Sep 17 00:00:00 2001 From: renovate Date: Thu, 19 Aug 2021 01:04:26 +0000 Subject: [PATCH 4/7] Update dependency setuptools to v57 --- hardening_manifest.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/hardening_manifest.yaml b/hardening_manifest.yaml index 480829d..db7b985 100644 --- a/hardening_manifest.yaml +++ b/hardening_manifest.yaml @@ -44,11 +44,11 @@ resources: validation: type: sha256 value: 11d095ed5c15265fc5c15cc40a45188675c239fb0f9913b673a33e54ff7d45f0 - - filename: setuptools-53.0.0-py3-none-any.whl - url: https://files.pythonhosted.org/packages/15/0e/255e3d57965f318973e417d5b7034223f1223de500d91b945ddfaef42a37/setuptools-53.0.0-py3-none-any.whl + - filename: setuptools-57.4.0-py3-none-any.whl + url: https://files.pythonhosted.org/packages/bd/25/5bdf7f1adeebd4e3fa76b2e2f045ae53ee208e40a4231ad0f0c3007e4353/setuptools-57.4.0-py3-none-any.whl validation: type: sha256 - value: 0e86620d658c5ca87a71a283bd308fcaeb4c33e17792ef6f081aec17c171347f + value: a49230977aa6cfb9d933614d2f7b79036e9945c4cdd7583163f4e920b83418d6 - filename: tini url: https://github.com/krallin/tini/releases/download/v0.19.0/tini validation: -- GitLab From 915b48ed1bce61d8bfd6247fc809b19c9d32b9fc Mon Sep 17 00:00:00 2001 From: Jeffrey Weatherford Date: Fri, 20 Aug 2021 12:33:05 +0000 Subject: [PATCH 5/7] Update Dockerfile, make it a little more maintainable --- Dockerfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index 8b7b3df..d915070 100644 --- a/Dockerfile +++ b/Dockerfile @@ -11,10 +11,10 @@ ARG spark_uid=185 USER root -COPY pip-21.1.1-py3-none-any.whl setuptools-53.0.0-py3-none-any.whl ./ +COPY *.whl ./ RUN dnf -y update && dnf -y upgrade && \ - pip3 install --upgrade ./pip-21.1.1-py3-none-any.whl ./setuptools-53.0.0-py3-none-any.whl && \ + pip3 install --upgrade ./*.whl && \ rm -rf /var/cache/dnf && \ mkdir -p /opt/spark/python/pyspark && \ mkdir -p /opt/spark/python/lib && \ -- GitLab From cf41b5d5e8944f787fb58bbb122df909c28c87ee Mon Sep 17 00:00:00 2001 From: Jeffrey Weatherford Date: Fri, 20 Aug 2021 14:46:04 +0000 Subject: [PATCH 6/7] Update Dockerfile to make it more maintainable. --- Dockerfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index 8b7b3df..d915070 100644 --- a/Dockerfile +++ b/Dockerfile @@ -11,10 +11,10 @@ ARG spark_uid=185 USER root -COPY pip-21.1.1-py3-none-any.whl setuptools-53.0.0-py3-none-any.whl ./ +COPY *.whl ./ RUN dnf -y update && dnf -y upgrade && \ - pip3 install --upgrade ./pip-21.1.1-py3-none-any.whl ./setuptools-53.0.0-py3-none-any.whl && \ + pip3 install --upgrade ./*.whl && \ rm -rf /var/cache/dnf && \ mkdir -p /opt/spark/python/pyspark && \ mkdir -p /opt/spark/python/lib && \ -- GitLab From cb212210f69fb22b7f711ff3c8d49e25363cb0e8 Mon Sep 17 00:00:00 2001 From: Jeffrey Weatherford Date: Fri, 20 Aug 2021 15:54:57 +0000 Subject: [PATCH 7/7] Update hardening_manifest.yaml --- hardening_manifest.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hardening_manifest.yaml b/hardening_manifest.yaml index 7fed785..a94fbb9 100644 --- a/hardening_manifest.yaml +++ b/hardening_manifest.yaml @@ -43,7 +43,7 @@ resources: url: https://files.pythonhosted.org/packages/ca/31/b88ef447d595963c01060998cb329251648acf4a067721b0452c45527eb8/pip-21.2.4-py3-none-any.whl validation: type: sha256 - value: 11d095ed5c15265fc5c15cc40a45188675c239fb0f9913b673a33e54ff7d45f0 + value: fa9ebb85d3fd607617c0c44aca302b1b45d87f9c2a1649b46c26167ca4296323 - filename: setuptools-57.4.0-py3-none-any.whl url: https://files.pythonhosted.org/packages/bd/25/5bdf7f1adeebd4e3fa76b2e2f045ae53ee208e40a4231ad0f0c3007e4353/setuptools-57.4.0-py3-none-any.whl validation: -- GitLab