Merge branch 'al' into 'development'

Al

See merge request !15

Dockerfile

+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/

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: