From 68c4f76e1c56f2d18dfc71458f1c99aa8b7881b5 Mon Sep 17 00:00:00 2001 From: Jonathan Chirwa Date: Fri, 6 Aug 2021 09:42:07 -0400 Subject: [PATCH 1/3] cleanup environment --- hardening_manifest.yaml | 10 +++++----- scripts/docker-entrypoint.sh | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/hardening_manifest.yaml b/hardening_manifest.yaml index 435c385..e246507 100644 --- a/hardening_manifest.yaml +++ b/hardening_manifest.yaml @@ -1,12 +1,12 @@ --- apiVersion: v1 # The repository name in registry1, excluding /ironbank/ -name: "via-science/base-image/conda_build_env" +name: "via-science/base-image/conda-build-env" # 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: -- "4.0.1" +- "4.0.2" # Build args passed to Dockerfile ARGs args: @@ -23,7 +23,7 @@ labels: org.opencontainers.image.url: "http://www.solvewithvia.com/" ## Name of the distributing entity, organization or individual org.opencontainers.image.vendor: "Via Science" - org.opencontainers.image.version: "4.0.1" + org.opencontainers.image.version: "4.0.2" ## Keywords to help with search (ex. "cicd,gitops,golang") # mil.dso.ironbank.image.keywords: "FIXME" ## This value can be "opensource" or "commercial" @@ -35,11 +35,11 @@ resources: - auth: region: ca-central-1 id: via_credential - url: s3://viascience-build-artifacts/conda_build_env/v4.0.1/master/python_via_env-ce2548d15702e1d14bb3e5f006974459948ecbd9.tar.gz + url: s3://viascience-build-artifacts/conda_build_env/v4.0.2/feature-cleanup/python_via_env-d6aa88da74229cff1e3895434e470119f650f1eb.tar.gz filename: python_via_env.tar.gz validation: type: sha256 - value: f4ab29c0eef8183124e6b608a6425f2a20bd06fc418df660cb6911add2591f87 + value: cc94b3a4a6adc441bfd3bca7952e210157409029144de41d70dd62d8d0862376 - auth: id: via_credential region: ca-central-1 diff --git a/scripts/docker-entrypoint.sh b/scripts/docker-entrypoint.sh index e8bd7bf..8561099 100644 --- a/scripts/docker-entrypoint.sh +++ b/scripts/docker-entrypoint.sh @@ -1,3 +1,3 @@ #!/bin/bash -source activate base_env +source activate via_env exec "$@" \ No newline at end of file -- GitLab From 43a6a88557e06570a02522126078c1dc5767b35c Mon Sep 17 00:00:00 2001 From: Jonathan Chirwa Date: Fri, 6 Aug 2021 10:35:55 -0400 Subject: [PATCH 2/3] revert to conda_build_env --- hardening_manifest.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hardening_manifest.yaml b/hardening_manifest.yaml index e246507..c632ee3 100644 --- a/hardening_manifest.yaml +++ b/hardening_manifest.yaml @@ -1,7 +1,7 @@ --- apiVersion: v1 # The repository name in registry1, excluding /ironbank/ -name: "via-science/base-image/conda-build-env" +name: "via-science/base-image/conda_build_env" # 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 -- GitLab From 205cb928def993a7a1e7699d926e76eca4232b10 Mon Sep 17 00:00:00 2001 From: Jonathan Chirwa Date: Fri, 6 Aug 2021 17:11:58 -0400 Subject: [PATCH 3/3] update manifest --- hardening_manifest.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/hardening_manifest.yaml b/hardening_manifest.yaml index c632ee3..2f20e98 100644 --- a/hardening_manifest.yaml +++ b/hardening_manifest.yaml @@ -35,11 +35,11 @@ resources: - auth: region: ca-central-1 id: via_credential - url: s3://viascience-build-artifacts/conda_build_env/v4.0.2/feature-cleanup/python_via_env-d6aa88da74229cff1e3895434e470119f650f1eb.tar.gz + url: s3://viascience-build-artifacts/conda_build_env/v4.0.2/master/python_via_env-d2fac54bebf8ff1c3b77c027d21018f8e3697792.tar.gz filename: python_via_env.tar.gz validation: type: sha256 - value: cc94b3a4a6adc441bfd3bca7952e210157409029144de41d70dd62d8d0862376 + value: ce2405faec75c88ad6bcf5f5e962b9ed971b76b8ecf520b443d2dd346aedf824 - auth: id: via_credential region: ca-central-1 -- GitLab