From e120a9741692de88eb0c3a4a3c83ce635006a72c Mon Sep 17 00:00:00 2001
From: stephane <stef@lesderniersdelaclasse.pw>
Date: Wed, 12 Jun 2024 11:32:32 +0200
Subject: [PATCH] php 8.1-8.3, IP gateaway et local ENV pip install

---
 attacker/Dockerfile  |  2 ++
 docker-compose.yml   |  8 ++++----
 recipient/Dockerfile | 36 ++++++++++++++++++------------------
 3 files changed, 24 insertions(+), 22 deletions(-)

diff --git a/attacker/Dockerfile b/attacker/Dockerfile
index b50d46e..a004ce3 100644
--- a/attacker/Dockerfile
+++ b/attacker/Dockerfile
@@ -8,6 +8,8 @@ FROM alpine:latest
 
 WORKDIR /home/attaquant
 
+ENV PIP_BREAK_SYSTEM_PACKAGES 1
+
 RUN adduser -D attaquant
 
 RUN apk add \
diff --git a/docker-compose.yml b/docker-compose.yml
index 53e3883..a128d89 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -1,11 +1,11 @@
-#
+  #
 # SPDX-FileCopyrightText: 2023 Afnic
 #
 # SPDX-License-Identifier: GPL-3.0-or-later
 #
 
 version: '3.8'
-name: 'spf-dkim-dmarc-workshop'
+# name: 'spf-dkim-dmarc-workshop'
 
 services:
   frontend:
@@ -52,7 +52,7 @@ services:
       - 172.31.0.53
     networks:
       internal:
-        ipv4_address: 172.31.10.1
+        ipv4_address: 172.31.0.20
         ipv6_address: fd4a:8c4:c28b:1000::1
 
   recipient:
@@ -84,7 +84,7 @@ networks:
     ipam:
       driver: default
       config:
-        - subnet: 172.31.10.0/16
+        - subnet: 172.31.0.0/16
         - subnet: fd4a:8c4:c28b::/48
 
   external:
diff --git a/recipient/Dockerfile b/recipient/Dockerfile
index ec8ea3d..5908666 100644
--- a/recipient/Dockerfile
+++ b/recipient/Dockerfile
@@ -7,12 +7,12 @@
 FROM alpine:latest AS roundcube-build
 
 RUN apk add composer \
-    php81-ctype \
-    php81-dom \
-    php81-ldap \
-    php81-tokenizer \
-    php81-xml \
-    php81-xmlwriter
+    php83-ctype \
+    php83-dom \
+    php83-ldap \
+    php83-tokenizer \
+    php83-xml \
+    php83-xmlwriter
 
 RUN install -d /var/www/roundcubemail
 
@@ -40,18 +40,18 @@ RUN apk add \
     nano-syntax \
     opendkim \
     opendmarc \
-    php81-apache2 \
-    php81-ctype \
-    php81-dom \
-    php81-intl \
-    php81-mbstring \
-    php81-openssl\
-    php81-pdo \
-    php81-pdo_sqlite \
-    php81-session \
-    php81-tokenizer \
-    php81-xml \
-    php81-xmlwriter \
+    php83-apache2 \
+    php83-ctype \
+    php83-dom \
+    php83-intl \
+    php83-mbstring \
+    php83-openssl\
+    php83-pdo \
+    php83-pdo_sqlite \
+    php83-session \
+    php83-tokenizer \
+    php83-xml \
+    php83-xmlwriter \
     postfix \
     postfix-policyd-spf-perl \
     s6-overlay \