Merge pull request #287 from massongit/add_requirements

The-Japan-DataScientist-Society · Jun 22, 2024 · 9fad20b · 9fad20b
2 parents 4440b8f + e9c3e5d
commit 9fad20b
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 3 deletions.
diff --git a/.github/workflows/fix_env.yml b/.github/workflows/fix_env.yml
@@ -41,7 +41,7 @@ jobs:
       - name: Install
         if: github.event_name != 'pull_request' || github.event.action != 'closed'
         run: |
-          pip install "$(grep -oE 'pipenv[^ ]+' dockerfiles/notebook/Dockerfile)"
+          pip install -r requirements.txt
           pipenv install
       - if: github.event_name != 'pull_request' || github.event.action != 'closed'
         run: sed -i -e "s/python_version = \".*\"/python_version = \"${{ steps.get_python_version.outputs.minor_version }}\"/g" Pipfile

diff --git a/dockerfiles/notebook/Dockerfile b/dockerfiles/notebook/Dockerfile
@@ -19,13 +19,14 @@ RUN apt-get update \
 
 USER jovyan
 WORKDIR /home/jovyan
+COPY requirements.txt .
 COPY Pipfile .
 COPY Pipfile.lock .
 COPY install.R .
 
-RUN pip install --no-cache-dir pipenv==2024.0.1 \
+RUN pip install --no-cache-dir -r requirements.txt \
     && pipenv install --system \
     && Rscript install.R \
-    && rm -rf Pipfile* install.R .cache/R/pkgcache/sysreqs/docker/*/Dockerfile /tmp/* /var/tmp/* .npm/
+    && rm -rf requirements.txt Pipfile* install.R .cache/R/pkgcache/sysreqs/docker/*/Dockerfile /tmp/* /var/tmp/* .npm/
 
 HEALTHCHECK --interval=5s --retries=20 CMD ["curl", "-s", "-S", "-o", "/dev/null", "http://localhost:8888"]
diff --git a/requirements.txt b/requirements.txt
@@ -0,0 +1 @@
+pipenv==2024.0.1