Skip to content

Commit e381bad

Browse files
committed
Update Dependencies, fix build warning and improve docker file
1 parent dd9ba0e commit e381bad

5 files changed

Lines changed: 50 additions & 70 deletions

File tree

docker/webApp/Dockerfile

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,10 +40,12 @@ RUN python -m venv /opt/venv
4040
# Make sure we use the virtualenv:
4141
ENV PATH="/opt/venv/bin:$PATH"
4242

43+
RUN python -m pip install --upgrade pip wheel
44+
4345
COPY source/dependencies /dependencies
4446
COPY source/requirements.txt /
4547

46-
RUN pip3 install -r requirements.txt
48+
RUN python -m pip install --no-cache-dir -r /requirements.txt
4749

4850
###############
4951
# BUILD IMAGE #

source/app/post_init.py

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1214,6 +1214,8 @@ def _custom_assets_symlinks(self):
12141214
filename = store_fullpath.split(os.path.sep)[-1]
12151215
show_fullpath = os.path.join(self._configuration['APP_PATH'], 'app',
12161216
self._configuration['ASSET_SHOW_PATH'].strip(os.path.sep), filename)
1217+
show_dir = os.path.dirname(show_fullpath)
1218+
os.makedirs(show_dir, exist_ok=True)
12171219
if not os.path.islink(show_fullpath):
12181220
os.symlink(store_fullpath, show_fullpath)
12191221
self._logger.info(f"Created assets img symlink {store_fullpath} -> {show_fullpath}")

source/requirements.txt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -27,8 +27,8 @@ alembic==1.18.4
2727
setuptools==81.0.0
2828
python-dateutil==2.9.0.post0
2929
python-gnupg==0.5.6
30-
pyzipper==0.3.6
31-
PyJWT==2.12.1
30+
pyzipper==0.4.0
31+
PyJWT==2.13.0
3232
cryptography==48.0.0
3333
ldap3==2.9.1
3434
pyintelowl==5.1.0
@@ -39,7 +39,7 @@ dictdiffer==0.9.0
3939
oic==1.7.0
4040
graphql-server[flask]==3.0.0
4141
graphene-sqlalchemy==3.0.0rc2
42-
bleach==6.1.0
42+
bleach==6.3.0
4343

4444
https://github.com/dfir-iris/docx-generator/releases/download/v0.9.1/docx_generator-0.9.1-py3-none-any.whl
4545
dependencies/iris_interface-1.2.0-py3-none-any.whl

ui/package-lock.json

Lines changed: 38 additions & 62 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

ui/package.json

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,13 +13,13 @@
1313
"devDependencies": {
1414
"@eslint/js": "^9.9.1",
1515
"@sveltejs/vite-plugin-svelte": "^3.1.2",
16-
"@types/jquery": "^3.5.30",
16+
"@types/jquery": "^3.5.34",
1717
"autoprefixer": "^10.4.20",
1818
"eslint": "^9.9.1",
1919
"eslint-plugin-svelte": "^2.43.0",
2020
"globals": "^15.9.0",
2121
"svelte": "^4.2.19",
22-
"tailwindcss": "^3.4.17",
22+
"tailwindcss": "^3.4.19",
2323
"vite": "^5.3.4",
2424
"vite-plugin-static-copy": "^1.0.6"
2525
},
@@ -30,13 +30,13 @@
3030
"chart.js": "^2.7.2",
3131
"dropzone": "^5.7.0",
3232
"html2canvas": "^1.4.0",
33-
"jquery": "^3.2.1",
33+
"jquery": "^3.7.1",
3434
"jquery-ui": "^1.12.1",
3535
"jquery-ui-touch-punch": "^0.2.3",
3636
"jquery-validation": "^1.19.3",
3737
"jquery.scrollbar": "^0.2.10",
3838
"moment": "^2.22.2",
39-
"showdown": "^1.9.0",
39+
"showdown": "^1.9.1",
4040
"socket.io": "^4.3.2",
4141
"sortablejs": "^1.7.0",
4242
"vis": "^4.21.0-EOL",

0 commit comments

Comments
 (0)