From c1c62c630c1d95a7b2a0f7b35294093d6364ee3d Mon Sep 17 00:00:00 2001 From: Salonee Date: Tue, 28 Jun 2022 15:16:07 -0400 Subject: [PATCH 1/5] added dockerfile and requirements file --- examples/Dockerfile | 49 +++++++++++++++++++++++++++++++++++++++++++ examples/requirements | 5 +++++ 2 files changed, 54 insertions(+) create mode 100644 examples/Dockerfile create mode 100644 examples/requirements diff --git a/examples/Dockerfile b/examples/Dockerfile new file mode 100644 index 000000000..ba5e3e156 --- /dev/null +++ b/examples/Dockerfile @@ -0,0 +1,49 @@ +FROM ubuntu:20.04 + +# $ docker build . -t continuumio/miniconda3:latest -t continuumio/miniconda3:4.5.11 +# $ docker run --rm -it continuumio/miniconda3:latest /bin/bash +# $ docker push continuumio/miniconda3:latest +# $ docker push continuumio/miniconda3:4.5.11 + +ENV LANG=C.UTF-8 LC_ALL=C.UTF-8 +ENV PATH /opt/conda/bin:$PATH + +RUN apt-get update --fix-missing && \ + apt-get install -y make wget bzip2 ca-certificates curl git && \ + apt-get clean && \ + rm -rf /var/lib/apt/lists/* + +COPY requirements.yml requirements.yml + +RUN wget --quiet https://repo.anaconda.com/miniconda/Miniconda3-4.5.11-Linux-x86_64.sh -O ~/miniconda.sh && \ + /bin/bash ~/miniconda.sh -b -p /opt/conda && \ + rm ~/miniconda.sh && \ + /opt/conda/bin/conda clean -tipsy && \ + ln -s /opt/conda/etc/profile.d/conda.sh /etc/profile.d/conda.sh && \ + echo ". /opt/conda/etc/profile.d/conda.sh" >> ~/.bashrc && \ + echo "conda activate elyra-env" >> ~/.bashrc && \ + /opt/conda/bin/conda env create --file requirements.yml + +# update nodejs +RUN curl -fsSL https://deb.nodesource.com/setup_16.x | bash - && \ + apt-get install -y nodejs + +# check what version of node was installed +RUN node --version + +# install yarn +RUN curl -sL https://dl.yarnpkg.com/debian/pubkey.gpg | gpg --dearmor | tee /usr/share/keyrings/yarnkey.gpg >/dev/null && \ + echo "deb [signed-by=/usr/share/keyrings/yarnkey.gpg] https://dl.yarnpkg.com/debian stable main" | tee /etc/apt/sources.list.d/yarn.list && \ + apt-get update && apt-get install yarn + +# check what version of yarn was installed +RUN yarn --version + +ENV TINI_VERSION v0.16.1 +ADD https://github.com/krallin/tini/releases/download/${TINI_VERSION}/tini /usr/bin/tini +RUN chmod +x /usr/bin/tini + +RUN mkdir -p /dev/elyra + +ENTRYPOINT [ "/usr/bin/tini", "--" ] +CMD [ "/bin/bash" ] diff --git a/examples/requirements b/examples/requirements new file mode 100644 index 000000000..614f90fd6 --- /dev/null +++ b/examples/requirements @@ -0,0 +1,5 @@ +name: elyra-env +dependencies: +- python>=3.8 +- pip: + - jupyterlab From 12d5095bd65645e0b10574d99e1135ee4a0056d8 Mon Sep 17 00:00:00 2001 From: Salonee Date: Tue, 12 Jul 2022 14:59:29 -0400 Subject: [PATCH 2/5] Updates to development-workflow file --- docs/source/developer_guide/development-workflow.md | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/docs/source/developer_guide/development-workflow.md b/docs/source/developer_guide/development-workflow.md index 7873c5f21..5782bd1e6 100644 --- a/docs/source/developer_guide/development-workflow.md +++ b/docs/source/developer_guide/development-workflow.md @@ -21,7 +21,7 @@ This section describes the steps necessary to build Elyra in a development envir #### Requirements * [Python 3 Miniconda](https://docs.conda.io/en/latest/miniconda.html) -* [NodeJS 16+](https://nodejs.org/en/) +* [NodeJS 16+](https://nodejs.org/en/) * [Yarn](https://yarnpkg.com/lang/en/docs/install) ### Setting up your development environment @@ -59,12 +59,22 @@ Download and install a [Python 3 version of Miniconda](https://docs.conda.io/en/ ``` conda install -y -c conda-forge/label/main nodejs ``` +* Verify node is installed correctly + + ``` + node --version + ``` * Install Yarn ``` conda install -y -c conda-forge/label/main yarn ``` +* Verify yarn is installed correctly + + ``` + yarn --version + ``` ### Setting up your Elyra Github repository From ff77760b26c10c039bc04ed2f08091cb4a6d4d39 Mon Sep 17 00:00:00 2001 From: Salonee Date: Tue, 12 Jul 2022 15:17:21 -0400 Subject: [PATCH 3/5] delete folder from other pr --- examples/Dockerfile | 49 ------------------------------------------- examples/requirements | 5 ----- 2 files changed, 54 deletions(-) delete mode 100644 examples/Dockerfile delete mode 100644 examples/requirements diff --git a/examples/Dockerfile b/examples/Dockerfile deleted file mode 100644 index ba5e3e156..000000000 --- a/examples/Dockerfile +++ /dev/null @@ -1,49 +0,0 @@ -FROM ubuntu:20.04 - -# $ docker build . -t continuumio/miniconda3:latest -t continuumio/miniconda3:4.5.11 -# $ docker run --rm -it continuumio/miniconda3:latest /bin/bash -# $ docker push continuumio/miniconda3:latest -# $ docker push continuumio/miniconda3:4.5.11 - -ENV LANG=C.UTF-8 LC_ALL=C.UTF-8 -ENV PATH /opt/conda/bin:$PATH - -RUN apt-get update --fix-missing && \ - apt-get install -y make wget bzip2 ca-certificates curl git && \ - apt-get clean && \ - rm -rf /var/lib/apt/lists/* - -COPY requirements.yml requirements.yml - -RUN wget --quiet https://repo.anaconda.com/miniconda/Miniconda3-4.5.11-Linux-x86_64.sh -O ~/miniconda.sh && \ - /bin/bash ~/miniconda.sh -b -p /opt/conda && \ - rm ~/miniconda.sh && \ - /opt/conda/bin/conda clean -tipsy && \ - ln -s /opt/conda/etc/profile.d/conda.sh /etc/profile.d/conda.sh && \ - echo ". /opt/conda/etc/profile.d/conda.sh" >> ~/.bashrc && \ - echo "conda activate elyra-env" >> ~/.bashrc && \ - /opt/conda/bin/conda env create --file requirements.yml - -# update nodejs -RUN curl -fsSL https://deb.nodesource.com/setup_16.x | bash - && \ - apt-get install -y nodejs - -# check what version of node was installed -RUN node --version - -# install yarn -RUN curl -sL https://dl.yarnpkg.com/debian/pubkey.gpg | gpg --dearmor | tee /usr/share/keyrings/yarnkey.gpg >/dev/null && \ - echo "deb [signed-by=/usr/share/keyrings/yarnkey.gpg] https://dl.yarnpkg.com/debian stable main" | tee /etc/apt/sources.list.d/yarn.list && \ - apt-get update && apt-get install yarn - -# check what version of yarn was installed -RUN yarn --version - -ENV TINI_VERSION v0.16.1 -ADD https://github.com/krallin/tini/releases/download/${TINI_VERSION}/tini /usr/bin/tini -RUN chmod +x /usr/bin/tini - -RUN mkdir -p /dev/elyra - -ENTRYPOINT [ "/usr/bin/tini", "--" ] -CMD [ "/bin/bash" ] diff --git a/examples/requirements b/examples/requirements deleted file mode 100644 index 614f90fd6..000000000 --- a/examples/requirements +++ /dev/null @@ -1,5 +0,0 @@ -name: elyra-env -dependencies: -- python>=3.8 -- pip: - - jupyterlab From 4cbe3346fd57c8f111fe20a9f4a21e2dcf2515ee Mon Sep 17 00:00:00 2001 From: Salonee Date: Tue, 2 Aug 2022 14:48:49 -0400 Subject: [PATCH 4/5] addressed comments from last round of review --- docs/source/developer_guide/development-workflow.md | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/docs/source/developer_guide/development-workflow.md b/docs/source/developer_guide/development-workflow.md index 5b113cea0..36cb06ff8 100644 --- a/docs/source/developer_guide/development-workflow.md +++ b/docs/source/developer_guide/development-workflow.md @@ -23,6 +23,7 @@ This section describes the steps necessary to build Elyra in a development envir * [Python 3 Miniconda](https://docs.conda.io/en/latest/miniconda.html) * [Node.js 16+](https://nodejs.org/en/) * [Yarn](https://yarnpkg.com/lang/en/docs/install) +* [GNU Make](https://www.gnu.org/software/make/) ### Setting up your development environment @@ -76,6 +77,14 @@ Download and install a [Python 3 version of Miniconda](https://docs.conda.io/en/ yarn --version ``` +* Install GNU Make + + Refer to the following link for installation instructions: + [GNU Make](https://www.gnu.org/software/make/) + + To verify the installation, run `make`. + Check with the output written below in [Build and Installation](#build-installation) to confirm that you have correctly installed `make`. + ### Setting up your Elyra Github repository * Fork the [Elyra Github repository](https://github.com/elyra-ai/elyra) (if you haven't already) From 5da3ad4d996bba31ec9bae61ea942c379eec0171 Mon Sep 17 00:00:00 2001 From: Alan Chin Date: Wed, 10 Aug 2022 09:35:52 -0700 Subject: [PATCH 5/5] Update docs/source/developer_guide/development-workflow.md Co-authored-by: Kevin Bates --- docs/source/developer_guide/development-workflow.md | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/docs/source/developer_guide/development-workflow.md b/docs/source/developer_guide/development-workflow.md index 36cb06ff8..e39630899 100644 --- a/docs/source/developer_guide/development-workflow.md +++ b/docs/source/developer_guide/development-workflow.md @@ -83,7 +83,11 @@ Download and install a [Python 3 version of Miniconda](https://docs.conda.io/en/ [GNU Make](https://www.gnu.org/software/make/) To verify the installation, run `make`. - Check with the output written below in [Build and Installation](#build-installation) to confirm that you have correctly installed `make`. + If you have yet to [set up the repository](#setting-up-your-development-environment), you should see a message like the following: + ``` + make: *** No targets specified and no makefile found. Stop. + ``` + Once the repository is set up, running `make` from that location should display the available tasks that are listed in the [Build & Installation](#build-installation) section below. ### Setting up your Elyra Github repository