Fix container image build issues for official releases (#2845)

Co-authored-by: Kevin Bates <kbates4@gmail.com>
elyra-ai · Jul 25, 2022 · 2c57b03 · 2c57b03
1 parent b8fe3ea
commit 2c57b03
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 7 deletions.
diff --git a/etc/docker/elyra/Dockerfile b/etc/docker/elyra/Dockerfile
@@ -23,13 +23,13 @@ ARG TAG="dev"
 ARG ELYRA_VERSION
 ARG ELYRA_PACKAGE=elyra-"$ELYRA_VERSION"-py3-none-any.whl
 
-COPY $ELYRA_PACKAGE requirements.txt ./
+COPY requirements.txt ${ELYRA_PACKAGE}* ./
 
 # Install Elyra
 RUN if [ "$TAG" = "dev" ] ; then \
-    python3 -m pip install --quiet --no-cache-dir "$ELYRA_PACKAGE"[all] && rm $ELYRA_PACKAGE; \
+    python3 -m pip install --quiet --no-cache-dir "${ELYRA_PACKAGE}[all]" && rm ${ELYRA_PACKAGE} ; \
     else \
-    python3 -m pip install --quiet --no-cache-dir elyra[all]=="$TAG" ; fi
+    python3 -m pip install --quiet --no-cache-dir "elyra[all]"=="$TAG" ; fi
 
 # Install custom requirements
 RUN python3 -m pip install -r requirements.txt && rm requirements.txt

diff --git a/etc/docker/kubeflow/Dockerfile b/etc/docker/kubeflow/Dockerfile
@@ -27,17 +27,17 @@ ARG ELYRA_PACKAGE=elyra-"$ELYRA_VERSION"-py3-none-any.whl
 ARG ELYRA_EXTRAS=[kfp-tekton,kfp-examples]
 
 # Includes the readme as a token file for COPY that always exists, otherwise production builds fail when whl not present
-COPY $ELYRA_PACKAGE README.md ./
+COPY README.md ${ELYRA_PACKAGE}* ./
 
 # Install Elyra
 RUN if [ "$TAG" = "dev" ] ; then \
-    python -m pip install --quiet --no-cache-dir "$ELYRA_PACKAGE""$ELYRA_EXTRAS"; \
+    python -m pip install --quiet --no-cache-dir "${ELYRA_PACKAGE}${ELYRA_EXTRAS}" ; \
     else \
-    python -m pip install --quiet --no-cache-dir elyra"$ELYRA_EXTRAS"=="$TAG" ; fi
+    python -m pip install --quiet --no-cache-dir "elyra${ELYRA_EXTRAS}"=="$TAG" ; fi
 
 # Cleanup
 USER root
-RUN rm $ELYRA_PACKAGE README.md
+RUN rm -f README.md ${ELYRA_PACKAGE}
 USER jovyan
 
 # Install component examples catalog