Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix container image build issues for official releases #2845

Merged
merged 2 commits into from
Jul 25, 2022
Merged

Fix container image build issues for official releases #2845

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5a85a2d
Fix Dockerfiles
ptitzler Jul 20, 2022
499b8bf
Update etc/docker/kubeflow/Dockerfile
ptitzler Jul 21, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions etc/docker/elyra/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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} ; \
kevin-bates marked this conversation as resolved.
Show resolved Hide resolved
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
Expand Down
8 changes: 4 additions & 4 deletions etc/docker/kubeflow/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down