Skip to content

Commit

Permalink
pull from master
Browse files Browse the repository at this point in the history
  • Loading branch information
shmuel44 committed Aug 12, 2024
2 parents 5268bcd + ca2c7c5 commit 3b5110e
Show file tree
Hide file tree
Showing 227 changed files with 6,237 additions and 4,428 deletions.
7 changes: 2 additions & 5 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
jobs:
docker_build:
docker:
- image: devdemisto/dockerbuild:1.0.0.99341
- image: devdemisto/dockerbuild:1.0.0.103500
steps:
- checkout
- run:
Expand All @@ -20,9 +20,6 @@ jobs:
- add_ssh_keys:
fingerprints:
- 14:9b:f7:c3:6a:d7:bd:34:8d:d6:3f:a7:68:d1:d6:af
- run:
name: install poetry
command: curl -sSL https://install.python-poetry.org | python3 -
- run:
name: Build Docker Images
command: |
Expand All @@ -36,4 +33,4 @@ workflows:
version: 2
full_build:
jobs:
- docker_build
- docker_build
94 changes: 93 additions & 1 deletion .github/CODEOWNERS
Validating CODEOWNERS rules …
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,100 @@
/docker/*.json @glicht @anara123
/docker/verify_licenses.py @glicht @anara123

/docker/demisto-sdk/ @samuelFain

# Supported docker images by native image

/docker/py3-native/Dockerfile @shmuel44
/docker/py3-native/pyproject.toml @shmuel44
/docker/py3-native/README.md @shmuel44

/docker/demisto-sdk/ @samuelFain
docker/python3/Pipfile @shmuel44
docker/python3/Dockerfile @shmuel44

docker/python3-deb/Pipfile @shmuel44
docker/python3-deb/Dockerfile @shmuel44

docker/python3-ubi/Pipfile @shmuel44
docker/python3-ubi/Dockerfile @shmuel44

docker/py3-tools/pyproject.toml @shmuel44
docker/py3-tools/Dockerfile @shmuel44

docker/py3-tools-ubi/pyproject.toml @shmuel44
docker/py3-tools-ubi/Dockerfile @shmuel44

docker/crypto/Pipfile @shmuel44
docker/crypto/Dockerfile @shmuel44

docker/readpdf/Pipfile @shmuel44
docker/readpdf/Dockerfile @shmuel44

docker/parse-emails/pyproject.toml @shmuel44
docker/parse-emails/Dockerfile @shmuel44

docker/docxpy/Pipfile @shmuel44
docker/docxpy/Dockerfile @shmuel44

docker/sklearn/Pipfile @shmuel44
docker/sklearn/Dockerfile @shmuel44

docker/pandas/Pipfile @shmuel44
docker/pandas/Dockerfile @shmuel44

docker/ippysocks-py3/Pipfile @shmuel44
docker/ippysocks-py3/Dockerfile @shmuel44

docker/oauthlib/Pipfile @shmuel44
docker/oauthlib/Dockerfile @shmuel44

docker/unzip/Pipfile @shmuel44
docker/unzip/Dockerfile @shmuel44

docker/py3ews/Pipfile @shmuel44
docker/py3ews/Dockerfile @shmuel44

docker/taxii2/Pipfile @shmuel44
docker/taxii2/Dockerfile @shmuel44

docker/pan-os-python/Pipfile @shmuel44
docker/pan-os-python/Dockerfile @shmuel44

docker/slackv3/Pipfile @shmuel44
docker/slackv3/Dockerfile @shmuel44

docker/google-api-py3/Pipfile @shmuel44
docker/google-api-py3/Dockerfile @shmuel44

docker/slackv3/Pipfile @shmuel44
docker/slackv3/Dockerfile @shmuel44

docker/boto3py3/Pipfile @shmuel44
docker/boto3py3/Dockerfile @shmuel44

docker/pyjwt3/Pipfile @shmuel44
docker/pyjwt3/Dockerfile @shmuel44

docker/joe-security/Pipfile @shmuel44
docker/joe-security/Dockerfile @shmuel44

docker/slack/Pipfile @shmuel44
docker/slack/Dockerfile @shmuel44

docker/office-utils/Pipfile @shmuel44
docker/office-utils/Dockerfile @shmuel44

docker/chromium/Pipfile @shmuel44
docker/chromium/Dockerfile @shmuel44

docker/tesseract/Pipfile @shmuel44
docker/tesseract/Dockerfile @shmuel44

docker/netutils/Pipfile @shmuel44
docker/netutils/Dockerfile @shmuel44

docker/auth-utils/pyproject.toml @shmuel44
docker/auth-utils/Dockerfile @shmuel44


#### End native image
8 changes: 8 additions & 0 deletions .github/dependabot.yml
Original file line number Diff line number Diff line change
Expand Up @@ -754,3 +754,11 @@ updates:
directory: /docker/keepercommander
schedule:
interval: daily
- package-ecosystem: pip
directory: /docker/python3-9-deb
schedule:
interval: daily
- package-ecosystem: pip
directory: /docker/cyberchef
schedule:
interval: daily
280 changes: 141 additions & 139 deletions Pipfile.lock

Large diffs are not rendered by default.

96 changes: 65 additions & 31 deletions README.md

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion docker/accessdata/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM demisto/python3:3.11.9.103066
FROM demisto/python3:3.11.9.107902

COPY requirements.txt .

Expand Down
2 changes: 1 addition & 1 deletion docker/ami-management/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@

FROM demisto/python3:3.8.6.14516
FROM demisto/python3:3.11.9.106968

COPY requirements.txt .

Expand Down
2 changes: 1 addition & 1 deletion docker/ami-management/Pipfile
Original file line number Diff line number Diff line change
Expand Up @@ -11,4 +11,4 @@ argparse = "*"
boto3 = "*"

[requires]
python_version = "3.8"
python_version = "3.11"
48 changes: 25 additions & 23 deletions docker/ami-management/Pipfile.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 3 additions & 1 deletion docker/ansible-runner/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@

FROM demisto/python3-deb:3.11.9.103065
FROM demisto/python3-deb:3.11.9.107463

COPY requirements.txt .

Expand All @@ -12,6 +12,8 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
openssh-client \
&& pip install --no-cache-dir -r requirements.txt \
&& pip install https://github.com/vmware/vsphere-automation-sdk-python/archive/refs/tags/v7.0.3.2.tar.gz \
&& pip install --upgrade azure-storage-blob \
&& pip uninstall aiohttp -y \
&& apt-get purge -y --auto-remove \
gcc \
python3-dev \
Expand Down
Loading

0 comments on commit 3b5110e

Please sign in to comment.