Skip to content

Commit 2a1c5da

Browse files
ostefanoostefano
committed
Replace Debian with Ubuntu 2404 LTS
1 parent b06bac9 commit 2a1c5da

File tree

8 files changed

+1005
-227
lines changed

8 files changed

+1005
-227
lines changed

‎core/Dockerfile‎

Lines changed: 240 additions & 217 deletions
Large diffs are not rendered by default.

‎core/files/CurlDownloader.php‎

Lines changed: 676 additions & 0 deletions
Large diffs are not rendered by default.

‎core/files/etc/apt/sources.list.d/ondrej-ubuntu-nginx-mainline-noble.sources‎

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
Types: deb
2+
URIs: https://ppa.launchpadcontent.net/ondrej/nginx-mainline/ubuntu/
3+
Suites: noble
4+
Components: main
5+
Signed-By:
6+
-----BEGIN PGP PUBLIC KEY BLOCK-----
7+
.
8+
mI0ESX35nAEEALKDCUDVXvmW9n+T/+3G1DnTpoWh9/1xNaz/RrUH6fQKhHr568F8
9+
hfnZP/2CGYVYkW9hxP9LVW9IDvzcmnhgIwK+ddeaPZqh3T/FM4OTA7Q78HSvR81m
10+
Jpf2iMLm/Zvh89ZsmP2sIgZuARiaHo8lxoTSLtmKXsM3FsJVlusyewHfABEBAAG0
11+
H0xhdW5jaHBhZCBQUEEgZm9yIE9uZMWZZWogU3Vyw72ItgQTAQIAIAUCSX35nAIb
12+
AwYLCQgHAwIEFQIIAwQWAgMBAh4BAheAAAoJEE9OoKrlJnpsQjYD/jW1NlIFAlT6
13+
EvF2xfVbkhERii9MapjaUsSso4XLCEmZdEGX54GQ01svXnrivwnd/kmhKvyxCqiN
14+
LDY/dOaK8MK//bDI6mqdKmG8XbP2vsdsxhifNC+GH/OwaDPvn1TyYB653kwyruCG
15+
FjEnCreZTcRUu2oBQyolORDl+BmF4DjLiQEzBBABCgAdFiEECvaBvTqO/UqmWMI/
16+
thEcm0xImQEFAmXTV0AACgkQthEcm0xImQGTTggAhuMHGeBZlRUAsZE7jJM7Mf06
17+
/WIhcgUfBfSFnJFlFH+xdEe/GFYyVk9kingDsPh90Ecnt4n8DJHTlsuUV1+SPBIO
18+
JfbQTUjx1n/+Ck+TVKzRByvrpRXtiZQ214m3zbhZpme2eBBMItZByjG7g925NUIq
19+
rL+R5ZoEcZvVlYscfsA0Sr8yJTsGJPefuLYI6eJkNDa1QkzBkSSW4XaCfNIxNBRs
20+
zN/qGe3xy0bibOaC4T2TcbZPSAVP855ahNbLAdqkyfAutiEWcKZmQpR9qNh4482k
21+
0pXVlQJ8UB860gVFHjwjFm/MsCeX8yfeAi38ZyInWL2OSG2pDx5ZzNESwnCPIg==
22+
=N1rh
23+
-----END PGP PUBLIC KEY BLOCK-----
24+

‎core/files/etc/apt/sources.list.d/ondrej-ubuntu-php-noble.sources‎

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
Types: deb
2+
URIs: https://ppa.launchpadcontent.net/ondrej/php/ubuntu/
3+
Suites: noble
4+
Components: main
5+
Signed-By: -----BEGIN PGP PUBLIC KEY BLOCK-----
6+
.
7+
mI0ESX35nAEEALKDCUDVXvmW9n+T/+3G1DnTpoWh9/1xNaz/RrUH6fQKhHr568F8
8+
hfnZP/2CGYVYkW9hxP9LVW9IDvzcmnhgIwK+ddeaPZqh3T/FM4OTA7Q78HSvR81m
9+
Jpf2iMLm/Zvh89ZsmP2sIgZuARiaHo8lxoTSLtmKXsM3FsJVlusyewHfABEBAAG0
10+
H0xhdW5jaHBhZCBQUEEgZm9yIE9uZMWZZWogU3Vyw72ItgQTAQIAIAUCSX35nAIb
11+
AwYLCQgHAwIEFQIIAwQWAgMBAh4BAheAAAoJEE9OoKrlJnpsQjYD/jW1NlIFAlT6
12+
EvF2xfVbkhERii9MapjaUsSso4XLCEmZdEGX54GQ01svXnrivwnd/kmhKvyxCqiN
13+
LDY/dOaK8MK//bDI6mqdKmG8XbP2vsdsxhifNC+GH/OwaDPvn1TyYB653kwyruCG
14+
FjEnCreZTcRUu2oBQyolORDl+BmF4DjLiQEzBBABCgAdFiEECvaBvTqO/UqmWMI/
15+
thEcm0xImQEFAmXTV0AACgkQthEcm0xImQGTTggAhuMHGeBZlRUAsZE7jJM7Mf06
16+
/WIhcgUfBfSFnJFlFH+xdEe/GFYyVk9kingDsPh90Ecnt4n8DJHTlsuUV1+SPBIO
17+
JfbQTUjx1n/+Ck+TVKzRByvrpRXtiZQ214m3zbhZpme2eBBMItZByjG7g925NUIq
18+
rL+R5ZoEcZvVlYscfsA0Sr8yJTsGJPefuLYI6eJkNDa1QkzBkSSW4XaCfNIxNBRs
19+
zN/qGe3xy0bibOaC4T2TcbZPSAVP855ahNbLAdqkyfAutiEWcKZmQpR9qNh4482k
20+
0pXVlQJ8UB860gVFHjwjFm/MsCeX8yfeAi38ZyInWL2OSG2pDx5ZzNESwnCPIg==
21+
=N1rh
22+
-----END PGP PUBLIC KEY BLOCK-----
23+

‎core/files/etc/nginx/sites-available/misp443‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
server {
2-
listen 443 ssl http2;
3-
listen [::]:443 ssl http2;
2+
listen 443 ssl;
3+
listen [::]:443 ssl;
4+
http2 on;
45

56
# disable access logs
67
access_log off;

‎core/files/test.php‎

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
<?php
2+
3+
$ch = curl_init("https://api.github.com/repos/Bacon/BaconQrCode/zipball/8674e51bb65af933a5ffaf1c308a660387c35c22");
4+
$fp = fopen("example_homepage.txt", "w");
5+
6+
curl_setopt($ch, CURLOPT_VERBOSE, true);
7+
curl_setopt($ch, CURLOPT_STDERR, fopen('php://stderr', 'w'));
8+
curl_setopt($ch, CURLOPT_FILE, $fp);
9+
curl_setopt($ch, CURLOPT_HEADER, 0);
10+
curl_setopt($ch, CURLOPT_USERAGENT, "Test SSL");
11+
curl_setopt($ch, CURLOPT_HTTP_VERSION, CURL_HTTP_VERSION_2_0);
12+
13+
curl_exec($ch);
14+
$httpcode = curl_getinfo($ch, CURLINFO_HTTP_CODE);
15+
echo 'HTTP code: ' . $httpcode;
16+
17+
if(curl_error($ch)) {
18+
fwrite($fp, curl_error($ch));
19+
}
20+
curl_close($ch);
21+
fclose($fp);
22+
?>

‎docker-bake.hcl‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,8 @@
11
variable "PLATFORMS" {
2-
default = ["linux/amd64", "linux/arm64"]
2+
default = [
3+
# "linux/amd64",
4+
"linux/arm64",
5+
]
36
}
47

58
variable "PYPI_REDIS_VERSION" {
@@ -72,7 +75,7 @@ variable "PHP_VER" {
7275

7376
group "default" {
7477
targets = [
75-
"misp-modules",
78+
# "misp-modules",
7679
"misp-core",
7780
]
7881
}

‎modules/Dockerfile‎

Lines changed: 12 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,19 @@
11
ARG DOCKER_HUB_PROXY=""
22

3-
FROM "${DOCKER_HUB_PROXY}python:3.12-slim-bookworm" as python-build
3+
FROM "${DOCKER_HUB_PROXY}ubuntu:24.04" as python-build
44
ENV DEBIAN_FRONTEND noninteractive
5+
56
ARG MODULES_TAG
67
ARG MODULES_COMMIT
78
ARG LIBFAUP_COMMIT
89

910
RUN apt-get update && apt-get install -y --no-install-recommends \
1011
cmake \
1112
git \
13+
python3-dev \
14+
python3-pip \
15+
python3-wheel \
16+
pipenv \
1217
build-essential \
1318
libpoppler-cpp-dev \
1419
libfuzzy-dev \
@@ -30,7 +35,6 @@ FROM "${DOCKER_HUB_PROXY}python:3.12-slim-bookworm" as python-build
3035
EOF
3136

3237
WORKDIR /srv/misp-modules
33-
RUN pip install pipenv
3438
RUN sed -i "s/python_version.*/python_version = \"3.12\"/" Pipfile
3539
RUN sed -i "/\[packages\]/a numpy = \"<2.0.0\"" Pipfile
3640
RUN sed -i "/\[packages\]/a pysafebrowsing = \"*\"" Pipfile
@@ -62,7 +66,7 @@ EOF
6266
RUN rm -rf /srv/faup
6367

6468

65-
FROM "${DOCKER_HUB_PROXY}python:3.12-slim-bookworm"
69+
FROM "${DOCKER_HUB_PROXY}ubuntu:24.04"
6670
ENV DEBIAN_FRONTEND noninteractive
6771

6872
RUN apt-get update && apt-get install -y --no-install-recommends \
@@ -75,16 +79,18 @@ FROM "${DOCKER_HUB_PROXY}python:3.12-slim-bookworm"
7579
libxml2 \
7680
libxslt1.1 \
7781
libzbar0 \
82+
python3-pip \
7883
&& apt-get autoremove -y && apt-get clean -y && rm -rf /var/lib/apt/lists/*
7984

8085
COPY --from=python-build /wheels /wheels
8186
COPY --from=python-build /usr/local/lib/libfaupl* /usr/local/lib/
82-
RUN pip install --no-cache-dir --use-deprecated=legacy-resolver /wheels/*.whl; ldconfig && rm -rf /wheels
83-
87+
RUN ldconfig
88+
RUN pip install --break-system-packages --no-cache-dir --use-deprecated=legacy-resolver /wheels/*.whl && rm -rf /wheels
89+
8490
# Since we compile faup ourselves and lua is not required anymore, we can load our own library
8591
# and skip the pre-compiled blob to improve compatibility with other architectures like ARM
8692
RUN sed -i s/LoadLibrary\(LOAD_LIB\)/LoadLibrary\(\"\\/usr\\/local\\/lib\\/libfaupl.so\"\)/ \
87-
/usr/local/lib/python3.12/site-packages/pyfaup/__init__.py
93+
/usr/local/lib/python3.12/dist-packages/pyfaup/__init__.py
8894

8995
# Disable (all) warnings raised when using 'future'
9096
RUN sed -i '/import sys/a import warnings\nwarnings.warn = lambda *args, **kwargs: None' \

0 commit comments

Comments
 (0)