Minor tweaks around variables

Dockerfile

@@ -15,10 +15,12 @@ ARG MM_SERVER_VERSION=5.34.2
 
 # 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}
+ARG PLUGIN_VERSION=1.0.3-rc
+
+ENV PLUGIN_ID=${PLUGIN_ID}
+ENV PLUGIN_ARTIFACT=${PLUGIN_ID}-${PLUGIN_VERSION}.tar.gz
 # ENV PLUGIN_ARTIFACT=${PLUGIN_ARTIFACT}
 # FROM registry1.dso.mil/ironbank/docker/scratch:ironbank
 # RUN echo $PLUGIN_ID
@@ -33,7 +35,7 @@ WORKDIR /scripts
 COPY call_mm_plugin_installer.sh .
 COPY install-mattermost-plugin.sh .
 # COPY *.tar.gz .
-COPY ${PLUGIN_ARTIFACT}.tar.gz .
+COPY ${PLUGIN_ARTIFACT} .
 # COPY --from=builder  /tmp/${PLUGIN_ID}-${PLUGIN_VERSION}}.tar.gz .
 # COPY --from=builder /tmp/install-mattermost-plugin.sh .
 # COPY --from=builder /tmp/call_mm_plugin_installer.sh .

install-mattermost-plugin.sh

@@ -36,7 +36,7 @@ echo " using Token: $token";
 result=$(/mattermost/bin/mmctl plugin delete ${PLUGIN_ID})
 
 # install the plugin with the tar.gz file
-result=$(/mattermost/bin/mmctl plugin add ${PLUGIN_ID}-${PLUGIN_VERSION}.tar.gz --format json)
+result=$(/mattermost/bin/mmctl plugin add ${PLUGIN_ARTIFACT} --format json)
 
 # if the install was successful, then enable it
 result=$(/mattermost/bin/mmctl plugin enable ${PLUGIN_ID} --format json)