Skip to content

Commit

Permalink
Merge branch 'develop' into sc4snmp-ui-tests
Browse files Browse the repository at this point in the history
  • Loading branch information
pszkamruk-splunk committed Nov 14, 2023
2 parents cde2a1b + 8be5775 commit 2882313
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 7 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/ci-main.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ jobs:
if: (github.actor != 'dependabot[bot]')
steps:
- uses: actions/checkout@v4
- uses: returntocorp/semgrep-action@v1
- uses: semgrep/semgrep-action@v1
with:
publishToken: ${{ secrets.SEMGREP_APP_TOKEN }}
pre-commit:
Expand Down
9 changes: 3 additions & 6 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
FROM python:3.10.0-bullseye as base
FROM python:3.10.0-bullseye AS base

ENV PYTHONFAULTHANDLER=1 \
PYTHONHASHSEED=random \
PYTHONUNBUFFERED=1
RUN mkdir /app
WORKDIR /app

FROM base as builder
FROM base AS builder
RUN pip install --upgrade pip ;\
pip install poetry

Expand All @@ -18,10 +18,7 @@ RUN poetry config virtualenvs.in-project true ;\
. /app/.venv/bin/activate ;\
pip install dist/*.whl




FROM base as final
FROM base AS final

COPY --from=builder /app/.venv /app/.venv
COPY entrypoint.sh ./
Expand Down

0 comments on commit 2882313

Please sign in to comment.