From 85c2d79747f963c8a540db220fd0c957db6a822e Mon Sep 17 00:00:00 2001
From: Paul Qualls <paul.qualls@parsons.com>
Date: Thu, 27 May 2021 11:56:08 -0600
Subject: [PATCH] Fixed env refs for ArtifactID

---
 Dockerfile | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 5bece2a..05c2259 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -3,9 +3,8 @@
 # ARG BASE_TAG=8.3
 
 ARG MM_SERVER_VERSION=5.34.2
-ARG PLUGIN_ID=mil.dso.p1.mattermost-admin-plugin
-ARG PLUGIN_VERSION=1.0.3-rc
-ARG PLUGIN_ARTIFACT=mil.dso.p1.mattermost-admin-plugin-1.0.3-rc.tar.gz
+
+
 # FROM ${BASE_REGISTRY}/${BASE_IMAGE}:${BASE_TAG} AS builder
 
 # WORKDIR /tmp
@@ -16,7 +15,11 @@ ARG PLUGIN_ARTIFACT=mil.dso.p1.mattermost-admin-plugin-1.0.3-rc.tar.gz
 
 # RUN tar xvf linux_amd64.tar
 FROM registry1.dso.mil/ironbank/opensource/mattermost/mattermost:${MM_SERVER_VERSION}
-
+ARG PLUGIN_ARTIFACT=mil.dso.p1.mattermost-admin-plugin-1.0.3-rc.tar.gz
+ARG PLUGIN_VERSION=1.0.3-rc
+ARG PLUGIN_ID=mil.dso.p1.mattermost-admin-plugin
+ENV PLUGIN_ARTIFACT=${PLUGIN_ID}-${PLUGIN_VERSION}
+# ENV PLUGIN_ARTIFACT=${PLUGIN_ARTIFACT}
 # FROM registry1.dso.mil/ironbank/docker/scratch:ironbank
 # RUN echo $PLUGIN_ID
 # ENV PLUGIN_ID=${PLUGIN_ID}
@@ -29,6 +32,7 @@ WORKDIR /scripts
 
 COPY call_mm_plugin_installer.sh .
 COPY install-mattermost-plugin.sh .
+# COPY *.tar.gz .
 COPY ${PLUGIN_ARTIFACT}.tar.gz .
 # COPY --from=builder  /tmp/${PLUGIN_ID}-${PLUGIN_VERSION}}.tar.gz .
 # COPY --from=builder /tmp/install-mattermost-plugin.sh .
-- 
GitLab