From 9cdf2ef0088246ac6b93a980ecce7532c8ccebd6 Mon Sep 17 00:00:00 2001 From: Celian RAIMBAULT Date: Sat, 5 Oct 2024 18:01:41 +0200 Subject: [PATCH 1/4] dockerfile: Updated --- Dockerfile | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/Dockerfile b/Dockerfile index ddd2dd4..c41a681 100644 --- a/Dockerfile +++ b/Dockerfile @@ -58,20 +58,21 @@ ARG INCLUDE_DEV_DEPS=false RUN apt-get update && \ apt-get install -y --no-install-recommends gcc git -RUN --mount=type=bind,target=./pyproject.toml,src=./pyproject.toml \ - --mount=type=bind,target=./poetry.lock,src=./poetry.lock \ - --mount=type=cache,target=/root/.cache/pypoetry \ +WORKDIR /iorgen + +COPY poetry.lock pyproject.toml README.md /iorgen +COPY iorgen /iorgen/iorgen + +RUN --mount=type=cache,target=/root/.cache/pypoetry \ python -m venv /opt/venv && \ + . /opt/venv/bin/activate && \ pip3 install --upgrade pip && \ pip3 install poetry && \ poetry install $(if [ $INCLUDE_DEV_DEPS = "false" ]; then echo "--only main"; fi) -COPY ./ /iorgen -WORKDIR /iorgen -RUN poetry install - FROM base +WORKDIR / + COPY --from=builder /opt/venv/ /opt/venv/ COPY --from=builder /iorgen/ /iorgen/ -WORKDIR / -- GitLab From a5193a2c837ec7addee9d39d88e613a6e4eb2d0f Mon Sep 17 00:00:00 2001 From: Celian RAIMBAULT Date: Sat, 5 Oct 2024 18:06:41 +0200 Subject: [PATCH 2/4] ci: Fixing errors --- .gitlab-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 5d2609f..7f8fbda 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,7 +1,7 @@ --- include: - - template: Security/License-Scanning.gitlab-ci.yml + - template: Jobs/License-Scanning.gitlab-ci.yml - template: Security/Secret-Detection.gitlab-ci.yml stages: -- GitLab From bfaa787c3f25c5f7f80914553ac27979ecf72e8a Mon Sep 17 00:00:00 2001 From: Celian RAIMBAULT Date: Sat, 5 Oct 2024 18:07:55 +0200 Subject: [PATCH 3/4] ci: Fixing errors --- .gitlab-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 7f8fbda..764e5be 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,7 +1,7 @@ --- include: - - template: Jobs/License-Scanning.gitlab-ci.yml + - template: Jobs/Dependency-Scanning.gitlab-ci.yml - template: Security/Secret-Detection.gitlab-ci.yml stages: -- GitLab From 656c4212498d1a07e339174da020ad4f9697ce46 Mon Sep 17 00:00:00 2001 From: Celian RAIMBAULT Date: Sat, 5 Oct 2024 18:09:45 +0200 Subject: [PATCH 4/4] ci: Fixing errors --- .gitlab-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 764e5be..16ee076 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -17,7 +17,7 @@ secret_detection: interruptible: true needs: [] -license_scanning: +dependency_scanning: stage: qa interruptible: true needs: [] -- GitLab