Skip to content

Commit

Permalink
Merge pull request #400 from iriusrisk/release/1.28.0
Browse files Browse the repository at this point in the history
release/1.28.0 to main
  • Loading branch information
dantolin-iriusrisk authored Sep 16, 2024
2 parents 85aba98 + 12ddfe8 commit 6807251
Show file tree
Hide file tree
Showing 5 changed files with 18 additions and 21 deletions.
4 changes: 2 additions & 2 deletions .github/actions/install-doc-dependencies/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,10 @@ runs:
using: "composite"
steps:

- name: Set up Python 3.8
- name: Set up Python 3.11
uses: actions/setup-python@v3
with:
python-version: "3.8"
python-version: "3.11"

- name: Configure git username
run: git config user.name 'github-actions[bot]' && git config user.email 'github-actions[bot]@users.noreply.github.com'
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/qa.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,14 +14,14 @@ jobs:
name: SonarCloud Analysis
uses: ./.github/workflows/sonar.yml
with:
python-version: "3.8"
python-version: "3.11"
secrets: inherit
test:
name: StartLeft Tests
strategy:
matrix:
os: [ ubuntu-latest, windows-latest ]
python-version: [ "3.8", "3.9", "3.10", "3.11" ]
python-version: [ "3.9", "3.10", "3.11" ]
uses: ./.github/workflows/test.yml
with:
os: ${{ matrix.os }}
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/sonar.yml
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ jobs:
args:
-Dsonar.projectKey=startleft
-Dsonar.organization=continuumsec
-Dsonar.python.version=3.8,3.9,3.10,3.11
-Dsonar.python.version=3.9,3.10,3.11
-Dsonar.qualitygate.wait=true
-Dsonar.python.coverage.reportPaths=coveragereport/coverage.xml

Expand Down
23 changes: 10 additions & 13 deletions deployment/Dockerfile.application
Original file line number Diff line number Diff line change
@@ -1,32 +1,29 @@
FROM python:3.8-alpine AS startleft-base
FROM python:3.11-alpine AS startleft-base

WORKDIR /usr/src/app

RUN apk update && \
apk upgrade && \
apk add git && \
apk add geos && \
apk add graphviz-dev

RUN apk --no-cache add lapack libstdc++ libmagic geos-dev && \
apk --no-cache add --virtual .builddeps g++ gcc gfortran musl-dev lapack-dev re2 re2-dev py3-pybind11-dev
apk --no-cache add geos geos-dev git graphviz-dev lapack libmagic libstdc++ && \
apk --no-cache add --virtual .builddeps g++ gcc gfortran lapack-dev musl-dev py3-pybind11-dev re2 re2-dev

COPY . .

RUN pip install --upgrade pip

RUN pip install .
RUN pip install --upgrade pip && pip install .


FROM python:3.8-alpine
FROM python:3.11-alpine

WORKDIR /app

RUN apk update && \
apk add libmagic re2 lapack cblas geos graphviz-dev
apk --no-cache add cblas geos graphviz-dev lapack libmagic re2 && \
adduser --disabled-password --no-create-home startleft

COPY --from=startleft-base /usr/local/lib/python3.8/site-packages /usr/local/lib/python3.8/site-packages
COPY --from=startleft-base /usr/local/lib/python3.11/site-packages /usr/local/lib/python3.11/site-packages

COPY --from=startleft-base /usr/local/bin/startleft /usr/local/bin/startleft

USER startleft

CMD ["startleft", "server", "--host", "0.0.0.0"]
6 changes: 3 additions & 3 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
keywords=['threat modeling', 'cyber security', 'appsec'],
packages=find_packages(),
include_package_data=True,
python_requires='>= 3.8, < 3.12',
python_requires='>= 3.9, <= 3.12',
install_requires=[
'pyyaml==6.0.1',
'jsonschema==4.19.0',
Expand Down Expand Up @@ -71,7 +71,7 @@
'Intended Audience :: Developers',
'Topic :: Security',
'License :: OSI Approved :: MIT License',
'Programming Language :: Python :: 3.8',
'Programming Language :: Python :: 3.9'
'Programming Language :: Python :: 3.10',
'Programming Language :: Python :: 3.11'
]
)

0 comments on commit 6807251

Please sign in to comment.