Skip to content

Commit

Permalink
Merge branch 'master' into CircleCI_workflows_to_GitHub
Browse files Browse the repository at this point in the history
  • Loading branch information
rshunim authored Oct 3, 2023
2 parents 3df9d2b + d879e2a commit 7ba0265
Show file tree
Hide file tree
Showing 244 changed files with 11,710 additions and 6,937 deletions.
7 changes: 3 additions & 4 deletions .github/CODEOWNERS
Validating CODEOWNERS rules …
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@
/docker/*.json @glicht @anara123
/docker/verify_licenses.py @glicht @anara123

/docker/py3-native/Dockerfile @GuyAfik @JudahSchwartz @samuelFain
/docker/py3-native/pyproject.toml @GuyAfik @JudahSchwartz @samuelFain
/docker/py3-native/verify.py @GuyAfik @JudahSchwartz @samuelFain
/docker/py3-native/README.md @GuyAfik @JudahSchwartz @samuelFain
/docker/py3-native/Dockerfile @GuyAfik @samuelFain
/docker/py3-native/pyproject.toml @GuyAfik @samuelFain
/docker/py3-native/README.md @GuyAfik @samuelFain
8 changes: 8 additions & 0 deletions .github/dependabot.yml
Original file line number Diff line number Diff line change
Expand Up @@ -331,6 +331,8 @@ updates:
interval: daily
- package-ecosystem: pip
directory: /docker/ntlm
ignore:
- dependency-name: "requests-ntlm"
schedule:
interval: daily
- package-ecosystem: pip
Expand Down Expand Up @@ -497,6 +499,8 @@ updates:
interval: daily
- package-ecosystem: pip
directory: /docker/py-ews
ignore:
- dependency-name: "requests-ntlm"
schedule:
interval: daily
- package-ecosystem: pip
Expand Down Expand Up @@ -723,3 +727,7 @@ updates:
directory: /docker/ldap
schedule:
interval: daily
- package-ecosystem: pip
directory: /docker/auth-utils
schedule:
interval: daily
38 changes: 22 additions & 16 deletions Pipfile.lock

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

2 changes: 1 addition & 1 deletion docker/akamai/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM demisto/crypto:1.0.0.72229
FROM demisto/crypto:1.0.0.76022

COPY requirements.txt .
RUN apk --update add --no-cache --virtual .build-dependencies python3-dev build-base wget \
Expand Down
54 changes: 27 additions & 27 deletions docker/akamai/Pipfile.lock

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

4 changes: 2 additions & 2 deletions docker/aquatone/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# Last modified: 2023-08-28T14:19:20.677396+00:00
FROM demisto/python3-deb:3.10.13.72520
# Last modified: 2023-09-22T00:50:51.810407+00:00
FROM demisto/python3-deb:3.10.13.75454

RUN apt-get update \
&& apt-get install -y --no-install-recommends \
Expand Down
2 changes: 1 addition & 1 deletion docker/argus-toolbelt/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@

FROM demisto/python3:3.10.13.72123
FROM demisto/python3:3.10.13.75921

COPY requirements.txt .

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

FROM demisto/python3:3.10.13.72123
FROM demisto/python3:3.10.13.75921

COPY requirements.txt .

Expand Down
1 change: 1 addition & 0 deletions docker/auth-utils/.gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
requirements.txt
11 changes: 11 additions & 0 deletions docker/auth-utils/Dockerfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@

FROM demisto/crypto:1.0.0.76022

COPY requirements.txt .

RUN apk --update add --no-cache krb5 krb5-libs
RUN apk --update add --no-cache --virtual .build-dependencies python3-dev libffi-dev gcc build-base wget git \
openssl-dev krb5-dev \
&& pip install --no-cache-dir -r requirements.txt \
&& apk del .build-dependencies

1 change: 1 addition & 0 deletions docker/auth-utils/build.conf
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
version=1.0.0
Loading

0 comments on commit 7ba0265

Please sign in to comment.