Skip to content

Commit

Permalink
Merge pull request #186 from /issues/101
Browse files Browse the repository at this point in the history
Update nightly + full build pipelines
  • Loading branch information
cccs-rs authored Feb 19, 2024
2 parents 8a4f3cf + 4ab3336 commit caf74ca
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 8 deletions.
2 changes: 1 addition & 1 deletion build-image/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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
4 changes: 2 additions & 2 deletions pipelines/full-build.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down
7 changes: 2 additions & 5 deletions root-image/common.Dockerfile
Original file line number Diff line number Diff line change
@@ -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 git\
&& 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

0 comments on commit caf74ca

Please sign in to comment.