Skip to content

Commit 0569e90

Browse files
gdesmargdesmar
committed
Updating dev setup for 4.7+
1 parent d2f35d9 commit 0569e90

3 files changed

Lines changed: 28 additions & 53 deletions

File tree

‎dev/core/config/config.yml‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,11 @@ core:
88
hosts: [http://elastic:devpass@elasticsearch:9200]
99
redis:
1010
host: redis
11+
port: 6379
1112
redis:
1213
nonpersistent:
1314
host: redis
15+
port: 6379
1416
persistent:
1517
host: redis
1618
port: 6379

‎dev/core/docker-compose.yml‎

Lines changed: 19 additions & 48 deletions
Original file line numberDiff line numberDiff line change
@@ -3,23 +3,21 @@ version: "2.4"
33
services:
44
# Service server
55
al_service_server:
6-
image: cccs/assemblyline_dev:4.6.1
6+
image: cccs/assemblyline-rust:4.7.latest
77
env_file:
88
- .env
99
ports:
1010
- "5003:5003"
1111
volumes:
1212
- ${PATH_REWRITE:-.}/config/:/etc/assemblyline/
13-
- ${ROOT_REWRITE:-../../..}/:/opt/alv4/
14-
working_dir: /opt/alv4/
15-
command: python3 /opt/alv4/assemblyline-service-server/assemblyline_service_server/app.py
13+
command: assemblyline-server service-api --allow-http-mode
1614
networks:
1715
- default
1816
- registration
1917

2018
# Create test data
2119
create_test_data:
22-
image: cccs/assemblyline_dev:4.6.1
20+
image: cccs/assemblyline_dev:4.7.1
2321
env_file:
2422
- .env
2523
environment:
@@ -45,7 +43,7 @@ services:
4543

4644
# UI
4745
al_ui:
48-
image: cccs/assemblyline_dev:4.6.1
46+
image: cccs/assemblyline_dev:4.7.1
4947
env_file:
5048
- .env
5149
ports:
@@ -58,7 +56,7 @@ services:
5856

5957
# SocketIO Server
6058
al_socketio:
61-
image: cccs/assemblyline_dev:4.6.1
59+
image: cccs/assemblyline_dev:4.7.1
6260
env_file:
6361
- .env
6462
ports:
@@ -71,7 +69,7 @@ services:
7169

7270
# Alerter
7371
al_alerter:
74-
image: cccs/assemblyline_dev:4.6.1
72+
image: cccs/assemblyline_dev:4.7.1
7573
env_file:
7674
- .env
7775
volumes:
@@ -89,7 +87,7 @@ services:
8987

9088
# Alerter
9189
al_archiver:
92-
image: cccs/assemblyline_dev:4.6.1
90+
image: cccs/assemblyline_dev:4.7.1
9391
env_file:
9492
- .env
9593
volumes:
@@ -107,7 +105,7 @@ services:
107105

108106
# Expiry
109107
al_expiry:
110-
image: cccs/assemblyline_dev:4.6.1
108+
image: cccs/assemblyline_dev:4.7.1
111109
env_file:
112110
- .env
113111
volumes:
@@ -125,7 +123,7 @@ services:
125123

126124
# Elasticsearch Metrics
127125
al_elastic_metrics:
128-
image: cccs/assemblyline_dev:4.6.1
126+
image: cccs/assemblyline_dev:4.7.1
129127
env_file:
130128
- .env
131129
volumes:
@@ -143,7 +141,7 @@ services:
143141

144142
# Metrics aggregator
145143
al_metrics:
146-
image: cccs/assemblyline_dev:4.6.1
144+
image: cccs/assemblyline_dev:4.7.1
147145
env_file:
148146
- .env
149147
volumes:
@@ -153,7 +151,7 @@ services:
153151

154152
# Hearbeat manager
155153
al_heartbeat:
156-
image: cccs/assemblyline_dev:4.6.1
154+
image: cccs/assemblyline_dev:4.7.1
157155
env_file:
158156
- .env
159157
volumes:
@@ -171,7 +169,7 @@ services:
171169

172170
# Stats aggregator
173171
al_stats:
174-
image: cccs/assemblyline_dev:4.6.1
172+
image: cccs/assemblyline_dev:4.7.1
175173
env_file:
176174
- .env
177175
volumes:
@@ -181,7 +179,7 @@ services:
181179

182180
# Workflow
183181
al_workflow:
184-
image: cccs/assemblyline_dev:4.6.1
182+
image: cccs/assemblyline_dev:4.7.1
185183
env_file:
186184
- .env
187185
volumes:
@@ -198,59 +196,32 @@ services:
198196
]
199197

200198
al_plumber:
201-
image: cccs/assemblyline_dev:4.6.1
199+
image: cccs/assemblyline-rust:4.7.latest
202200
env_file:
203201
- .env
204202
volumes:
205203
- ${PATH_REWRITE:-.}/config/:/etc/assemblyline/
206-
- ${ROOT_REWRITE:-../../..}/:/opt/alv4/
207-
command: python3 /opt/alv4/assemblyline-core/assemblyline_core/plumber/run_plumber.py
208-
healthcheck:
209-
test:
210-
[
211-
"CMD",
212-
"bash",
213-
"-c",
214-
"if [[ ! `find /tmp/heartbeat -newermt '-30 seconds'` ]]; then false; fi",
215-
]
204+
command: assemblyline-server plumber
216205

217206
# Dispatcher processes
218207
al_dispatcher:
219-
image: cccs/assemblyline_dev:4.6.1
208+
image: cccs/assemblyline-rust:4.7.latest
220209
env_file:
221210
- .env
222211
volumes:
223212
- ${PATH_REWRITE:-.}/config/:/etc/assemblyline/
224-
- ${ROOT_REWRITE:-../../..}/:/opt/alv4/
225213
environment:
226214
SKIP_SERVICE_SETUP: "true"
227-
command: python3 /opt/alv4/assemblyline-core/assemblyline_core/dispatching
228-
healthcheck:
229-
test:
230-
[
231-
"CMD",
232-
"bash",
233-
"-c",
234-
"if [[ ! `find /tmp/heartbeat -newermt '-30 seconds'` ]]; then false; fi",
235-
]
215+
command: assemblyline-server dispatcher
236216

237217
# Ingester Processes
238218
al_ingester:
239-
image: cccs/assemblyline_dev:4.6.1
219+
image: cccs/assemblyline-rust:4.7.latest
240220
env_file:
241221
- .env
242222
volumes:
243223
- ${PATH_REWRITE:-.}/config/:/etc/assemblyline/
244-
- ${ROOT_REWRITE:-../../..}/:/opt/alv4/
245-
command: python3 /opt/alv4/assemblyline-core/assemblyline_core/ingester
246-
healthcheck:
247-
test:
248-
[
249-
"CMD",
250-
"bash",
251-
"-c",
252-
"if [[ ! `find /tmp/heartbeat -newermt '-30 seconds'` ]]; then false; fi",
253-
]
224+
command: assemblyline-server ingester
254225

255226
# You can use this if you want a jupyter notebook to debug something in development
256227
# notebook:

‎docker/al_dev/Dockerfile‎

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,26 +1,28 @@
11
FROM python:3.11-slim-bookworm
22

33
# Setup environment varibles
4-
ENV PYTHONPATH /opt/alv4/assemblyline-base:/opt/alv4/assemblyline-core:/opt/alv4/assemblyline-service-server:/opt/alv4/assemblyline-service-client:/opt/alv4/assemblyline_client:/opt/alv4/assemblyline-ui
4+
ENV PYTHONPATH /opt/alv4/assemblyline-base:/opt/alv4/assemblyline-core:/opt/alv4/assemblyline-service-client:/opt/alv4/assemblyline_client:/opt/alv4/assemblyline-ui
55

66
# Upgrade packages
77
RUN apt-get update && apt-get -yy upgrade && rm -rf /var/lib/apt/lists/*
88

9-
# SSDEEP pkg requirments
10-
RUN apt-get update && apt-get install -yy build-essential libssl-dev libffi-dev libfuzzy-dev libldap2-dev libsasl2-dev libmagic1 zip 7zip && rm -rf /var/lib/apt/lists/*
9+
RUN apt-get update && \
10+
apt-get install -yy \
11+
# python-ldap dependencies
12+
build-essential libldap2-dev libsasl2-dev \
13+
libssl-dev libmagic1 zip 7zip && \
14+
rm -rf /var/lib/apt/lists/*
1115

1216
# Python packages requirements
1317
RUN pip install --no-warn-script-location --no-cache-dir \
1418
assemblyline[test] \
1519
assemblyline-core \
1620
assemblyline-ui \
17-
assemblyline-service-server \
1821
debugpy \
1922
&& pip uninstall -y \
2023
assemblyline \
2124
assemblyline-core \
2225
assemblyline-ui \
23-
assemblyline-service-server \
2426
&& rm -rf ~/.cache/pip
2527

2628

0 commit comments

Comments
 (0)