From 26a714d9c231a8644435fb8d67c46eb2bb47e799 Mon Sep 17 00:00:00 2001
From: Yassine Doghri <yassine@doghri.fr>
Date: Wed, 2 Aug 2023 19:05:12 +0200
Subject: [PATCH] build(devcontainer): update network's subnet to 172.31.0.0/24

---
 app/Entities/Episode.php                   |  5 +----
 composer.json                              |  1 +
 docker-compose.yml                         | 12 ++++++------
 docs/src/contributing/setup-development.md |  2 +-
 4 files changed, 9 insertions(+), 11 deletions(-)

diff --git a/app/Entities/Episode.php b/app/Entities/Episode.php
index bb45c773..41c54a5b 100644
--- a/app/Entities/Episode.php
+++ b/app/Entities/Episode.php
@@ -238,10 +238,7 @@ class Episode extends Entity
             (new MediaModel('audio'))->updateMedia($this->getAudio());
         } else {
             $audio = new Audio([
-                'file_key' => 'podcasts/' . $this->getPodcast()->handle . '/' . pathinfo(
-                    $file->getRandomName(),
-                    PATHINFO_FILENAME
-                ) . '.' . $file->getExtension(),
+                'file_key'      => 'podcasts/' . $this->getPodcast()->handle . '/' . $file->getRandomName(),
                 'language_code' => $this->getPodcast()
                     ->language_code,
                 'uploaded_by' => $this->attributes['updated_by'],
diff --git a/composer.json b/composer.json
index 0e7f7fcb..039093f1 100644
--- a/composer.json
+++ b/composer.json
@@ -48,6 +48,7 @@
     }
   },
   "scripts": {
+    "dev": "php spark serve",
     "test": "vendor/bin/phpunit --no-coverage",
     "analyse": "vendor/bin/phpstan analyse --ansi",
     "rector": "vendor/bin/rector process --dry-run --ansi --memory-limit=2G",
diff --git a/docker-compose.yml b/docker-compose.yml
index 8111cc2f..43a05a53 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -4,7 +4,7 @@ networks:
   castopod:
     ipam:
       config:
-        - subnet: 172.100.0.0/24
+        - subnet: 172.31.0.0/24
 
 services:
   app:
@@ -22,7 +22,7 @@ services:
       - mariadb
     networks:
       castopod:
-        ipv4_address: 172.100.0.2
+        ipv4_address: 172.31.0.2
 
   redis:
     image: redis:alpine
@@ -33,7 +33,7 @@ services:
       - redis:/data
     networks:
       castopod:
-        ipv4_address: 172.100.0.3
+        ipv4_address: 172.31.0.3
 
   mariadb:
     image: mariadb:10.2
@@ -50,7 +50,7 @@ services:
       MYSQL_PASSWORD: castopod
     networks:
       castopod:
-        ipv4_address: 172.100.0.4
+        ipv4_address: 172.31.0.4
 
   phpmyadmin:
     image: phpmyadmin/phpmyadmin:latest
@@ -67,7 +67,7 @@ services:
       - mariadb
     networks:
       castopod:
-        ipv4_address: 172.100.0.5
+        ipv4_address: 172.31.0.5
 
   s3:
     image: adobe/s3mock:latest
@@ -82,7 +82,7 @@ services:
       - ./data/s3:/data:cached
     networks:
       castopod:
-        ipv4_address: 172.100.0.6
+        ipv4_address: 172.31.0.6
 
 volumes:
   redis:
diff --git a/docs/src/contributing/setup-development.md b/docs/src/contributing/setup-development.md
index a5216cda..82e4a8fd 100644
--- a/docs/src/contributing/setup-development.md
+++ b/docs/src/contributing/setup-development.md
@@ -74,7 +74,7 @@ to help you kickstart your contribution.
    # -----------------------
    #media.fileManager="s3"
    #media.s3.bucket="castopod"
-   #media.s3.endpoint="http://172.100.0.6:9090/"
+   #media.s3.endpoint="http://172.31.0.6:9090/"
    #media.s3.pathStyleEndpoint=true
    ```