merge main

6 files changed, 28 insertions, 15 deletions

diff --git a/.dockerignore b/.dockerignore
new file mode 100644
index 00000000..557a30ab
--- /dev/null
+++ b/.dockerignore
@@ -0,0 +1,2 @@
+# The directory with the datasets
+dataset/
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index b2343139..fb99b4f1 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -33,24 +33,23 @@ jobs:
     runs-on: ubuntu-latest
     if: github.repository == 'crocs-muni/sec-certs'
     steps:
-      - name: Set up QEMU
-        uses: docker/setup-qemu-action@v1
-      - name: Set up Docker Build
-        uses: docker/setup-buildx-action@v1
+      - name: Check out the repo
+        uses: actions/checkout@v3
       - name: Login to DockerHub
-        uses: docker/login-action@v1
+        uses: docker/login-action@f4ef78c080cd8ba55a85445d5b36e214a81df20a
         with:
           username: ${{ secrets.DOCKERHUB_USERNAME }}
           password: ${{ secrets.DOCKERHUB_PASSWORD }}
       - name: Extract metadata (tags, labels) for Docker
         id: meta
-        uses: docker/metadata-action@98669ae865ea3cffbcbaa878cf57c20bbf1c6c38
+        uses: docker/metadata-action@9ec57ed1fcdbf14dcef7dfbe97b2010124a938b7
         with:
           images: seccerts/sec-certs
       - name: Build and push
         id: docker_build
-        uses: docker/build-push-action@v2
+        uses: docker/build-push-action@3b5e8027fcad23fda98b2e3ac259d8d67585f671
         with:
+          context: .
           file: Dockerfile
           push: true
           tags: ${{ steps.meta.outputs.tags }}
diff --git a/Dockerfile b/Dockerfile
index 3dbe6681..a52458f9 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,3 +1,16 @@
+# First stage just copies the content of the git repo to /tmp so that we can copy it to the final image
+# Note that if your folder with repository contains some large files, they should be added to .dockerignore
+FROM ubuntu:jammy-20220428 AS intermediate
+
+RUN apt-get update
+RUN apt-get install git -y
+
+WORKDIR /tmp
+COPY . /tmp
+RUN mkdir /output
+RUN git ls-files | xargs cp -r --parents -t /output
+COPY .git /output/.git
+
 FROM ubuntu:jammy-20220428
 
 ENV USER="user"
@@ -30,12 +43,11 @@ RUN adduser --disabled-password \
 
 RUN chown -R ${NB_UID}:${NB_GID} ${HOME}
 USER ${USER}
-WORKDIR ${HOME}
-
-# Due to setuptools_scm for versioning, we need whole repository with .git
-RUN git clone https://github.com/crocs-muni/sec-certs
 
+# Get the intermediate files from the previous stage
+RUN mkdir ${HOME}/sec-certs
 WORKDIR ${HOME}/sec-certs
+COPY --chown=${NB_UID}:${NB_GID} --from=intermediate /output ${HOME}/sec-certs
 
 # Create virtual environment
 ENV VENV_PATH=${HOME}/venv
@@ -51,7 +63,7 @@ RUN \
   pip3 install -e . && \
   python3 -m spacy download en_core_web_sm
 
-# #just to be sure that pdftotext is in $PATH
+# just to be sure that pdftotext is in $PATH
 ENV PATH /usr/bin/pdftotext:${PATH}
 
 # # Run the application:
diff --git a/requirements/dev_requirements.txt b/requirements/dev_requirements.txt
index 0c6d3cf6..c1b2db28 100644
--- a/requirements/dev_requirements.txt
+++ b/requirements/dev_requirements.txt
@@ -456,7 +456,7 @@ scikit-learn==1.2.0
     # via
     #   sec-certs (./../pyproject.toml)
     #   sentence-transformers
-scipy==1.9.3
+scipy==1.10.0
     # via
     #   scikit-learn
     #   sec-certs (./../pyproject.toml)
diff --git a/requirements/requirements.txt b/requirements/requirements.txt
index 13a9cc3a..98b45030 100644
--- a/requirements/requirements.txt
+++ b/requirements/requirements.txt
@@ -317,7 +317,7 @@ scikit-learn==1.2.0
     # via
     #   sec-certs (./../pyproject.toml)
     #   sentence-transformers
-scipy==1.9.3
+scipy==1.10.0
     # via
     #   scikit-learn
     #   sec-certs (./../pyproject.toml)
diff --git a/requirements/test_requirements.txt b/requirements/test_requirements.txt
index 692d7e55..917d46a6 100644
--- a/requirements/test_requirements.txt
+++ b/requirements/test_requirements.txt
@@ -335,7 +335,7 @@ scikit-learn==1.2.0
     # via
     #   sec-certs (./../pyproject.toml)
     #   sentence-transformers
-scipy==1.9.3
+scipy==1.10.0
     # via
     #   scikit-learn
     #   sec-certs (./../pyproject.toml)