From 4b273c870ffd9954bd43649d9a1744cac1eb8515 Mon Sep 17 00:00:00 2001 From: cccs-rs Date: Sat, 3 Feb 2024 07:55:53 +0000 Subject: [PATCH 1/4] Update nightly + full build pipelines --- pipelines/full-build.yaml | 2 +- root-image/common.Dockerfile | 7 ++----- 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/pipelines/full-build.yaml b/pipelines/full-build.yaml index e3cc02b..c362d62 100644 --- a/pipelines/full-build.yaml +++ b/pipelines/full-build.yaml @@ -72,7 +72,7 @@ stages: - task: UsePythonVersion@0 displayName: Set python version inputs: - versionSpec: 3.9 + versionSpec: 3.11 - script: | set -ex # Echo commands before they are run diff --git a/root-image/common.Dockerfile b/root-image/common.Dockerfile index bc464b8..f6bc9ab 100644 --- a/root-image/common.Dockerfile +++ b/root-image/common.Dockerfile @@ -1,12 +1,9 @@ -FROM python:3.9-slim-buster AS base +FROM python:3.11-slim-bookworm AS base # Upgrade dist packages RUN apt-get update && apt-get -yy upgrade && rm -rf /var/lib/apt/lists/* # Get required apt packages RUN apt-get update \ - && apt-get install -yy libffi6 libfuzzy2 libmagic1 \ + && apt-get install -yy libffi8 libfuzzy2 libmagic1 \ && rm -rf /var/lib/apt/lists/* - -# Patch Python 3.9 for FIPS - https://github.com/python/cpython/issues/95231 (Not necessary for Python 3.10+) -RUN sed -i -e 's/if e.errno == errno.EINVAL:/if e.errno in {errno.EINVAL, errno.EPERM, errno.ENOSYS}:/g' /usr/local/lib/python3.9/crypt.py From 9a5dd62840b8aff37de18ba2939f55b453268000 Mon Sep 17 00:00:00 2001 From: cccs-rs <62077998+cccs-rs@users.noreply.github.com> Date: Sat, 3 Feb 2024 03:27:57 -0500 Subject: [PATCH 2/4] Update Dockerfile --- build-image/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build-image/Dockerfile b/build-image/Dockerfile index 86685cc..3f437fe 100644 --- a/build-image/Dockerfile +++ b/build-image/Dockerfile @@ -9,4 +9,4 @@ RUN apt-get update \ # Install assemblyline dependencies, but don't keep assemblyline RUN pip install --user assemblyline && pip uninstall assemblyline -y -RUN chmod 750 /root/.local/lib/python3.9/site-packages +RUN chmod 750 /root/.local/lib/python3.11/site-packages From 56d896d3cfdaf87cc03a481853dd122b2166d53f Mon Sep 17 00:00:00 2001 From: cccs-rs Date: Thu, 8 Feb 2024 20:32:31 +0000 Subject: [PATCH 3/4] Add git to the nightly builds --- root-image/common.Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/root-image/common.Dockerfile b/root-image/common.Dockerfile index f6bc9ab..0cb8eba 100644 --- a/root-image/common.Dockerfile +++ b/root-image/common.Dockerfile @@ -5,5 +5,5 @@ RUN apt-get update && apt-get -yy upgrade && rm -rf /var/lib/apt/lists/* # Get required apt packages RUN apt-get update \ - && apt-get install -yy libffi8 libfuzzy2 libmagic1 \ + && apt-get install -yy libffi8 libfuzzy2 libmagic1 git\ && rm -rf /var/lib/apt/lists/* From 4ab3336309ccd21db6a0342a6e7b70ab8d62d485 Mon Sep 17 00:00:00 2001 From: cccs-rs <62077998+cccs-rs@users.noreply.github.com> Date: Wed, 14 Feb 2024 19:29:43 +0000 Subject: [PATCH 4/4] Update display name --- pipelines/full-build.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pipelines/full-build.yaml b/pipelines/full-build.yaml index c362d62..9a55f06 100644 --- a/pipelines/full-build.yaml +++ b/pipelines/full-build.yaml @@ -560,7 +560,7 @@ stages: cccstemp.azurecr.io/assemblyline-v4-service-base:${TAG} \ /bin/bash -c "pip install -r requirements.txt; CI=1 pytest -rsx --durations=10" workingDirectory: $(Pipeline.Workspace)/working/assemblyline-v4-service - displayName: Test Service Server + displayName: Test Service Base - stage: deploy displayName: Deploy