Skip to content

Commit

Permalink
Merge pull request #45 from Ostorlab/Update-from-python3.10-to-3.11
Browse files Browse the repository at this point in the history
Update from python3.10 to 3.11
  • Loading branch information
3asm authored Nov 3, 2023
2 parents 826032a + d2cae0c commit 8eedc4a
Show file tree
Hide file tree
Showing 4 changed files with 12 additions and 7 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/pylint.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ jobs:
strategy:
fail-fast: false
matrix:
python-version: ["3.10"]
python-version: ["3.11"]

steps:
- uses: actions/checkout@v2
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/pytest.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ jobs:
strategy:
fail-fast: false
matrix:
python-version: ["3.10"]
python-version: ["3.11"]

steps:
- uses: actions/checkout@v2
Expand Down
13 changes: 9 additions & 4 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -23,21 +23,26 @@ RUN ./gradlew shadowJar \


FROM ubuntu:22.04
ENV DEBIAN_FRONTEND=noninteractive
# Install dependencies
RUN apt update && apt install -y --no-install-recommends nmap ncrack ca-certificates openjdk-11-jre wireguard-tools openresolv iptables iproute2 python3-pip && rm -rf /var/lib/apt/lists/*
RUN apt-get update && apt-get install -y software-properties-common \
&& add-apt-repository ppa:deadsnakes/ppa \
&& apt-get remove -y python*

RUN apt update && apt install -y --no-install-recommends nmap ncrack ca-certificates openjdk-11-jre wireguard-tools openresolv iptables iproute2 python3.11 python3.11-dev python3-pip && rm -rf /var/lib/apt/lists/*

COPY --from=tsunami_builder /usr/tsunami /usr/tsunami
RUN mkdir -p /usr/tsunami/logs

RUN mkdir /install
WORKDIR /install
RUN python3.11 -m pip install --upgrade pip
COPY requirement.txt /requirement.txt
RUN pip install -r /requirement.txt

RUN python3.11 -m pip install -r /requirement.txt

RUN mkdir -p /app/agent
ENV PYTHONPATH=/app
COPY agent /app/agent
COPY ostorlab.yaml /app/agent/ostorlab.yaml
WORKDIR /app/agent
CMD ["python3", "/app/agent/tsunami_agent.py"]
CMD ["python3.11", "/app/agent/tsunami_agent.py"]
2 changes: 1 addition & 1 deletion ostorlab.yaml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
kind: Agent
name: tsunami
version: 0.4.4
version: 0.5.0
image: images/logo.png
description: |
This repository is an implementation of [Ostorlab Agent](https://pypi.org/project/ostorlab/) for the [Tsunami Scanner](https://github.com/google/tsunami-security-scanner) by Google.
Expand Down

0 comments on commit 8eedc4a

Please sign in to comment.