From dc55ca241a634c4fd327e3ff029ad55d3265c6d2 Mon Sep 17 00:00:00 2001 From: Al Fontaine Date: Thu, 19 Aug 2021 16:10:08 +0000 Subject: [PATCH 1/2] Update hardening_manifest.yaml --- hardening_manifest.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/hardening_manifest.yaml b/hardening_manifest.yaml index 8aef531..34553d8 100644 --- a/hardening_manifest.yaml +++ b/hardening_manifest.yaml @@ -13,8 +13,8 @@ tags: # Build args passed to Dockerfile ARGs args: - BASE_IMAGE: "carnegie-mellon/python-ai/python38-ai" - BASE_TAG: "3.8" + BASE_IMAGE: "opensource/r/r-studio" + BASE_TAG: "1.4.1717" # Docker image labels labels: -- GitLab From 17f38c505e01a37afd9c368222b676cfd6e9a043 Mon Sep 17 00:00:00 2001 From: Al Fontaine Date: Thu, 19 Aug 2021 16:11:54 +0000 Subject: [PATCH 2/2] Update Dockerfile --- Dockerfile | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 1890d27..70ded08 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,5 +1,10 @@ +ARG BASE_REGISTRY=registry1.dso.mil +ARG BASE_IMAGE=ironbank/opensource/r/r-studio +ARG BASE_TAG=latest + FROM registry1.dso.mil/ironbank/aiml/python/python-r-ai as base -FROM registry1.dso.mil/ironbank/opensource/r/r-studio as final + +FROM ${BASE_REGISTRY}/${BASE_IMAGE}:${BASE_TAG} COPY --from=base /usr/local/bin/ /usr/local/bin/ COPY --from=base /usr/local/lib/ /usr/local/lib/ -- GitLab