Fix: broken file links for development files (#469)

* FIx broken file links for development files

* Fix: Compose Files Context / Paths / Networks

.github/CONTRIBUTING.md

@@ -2,7 +2,7 @@
 
 Thank you for investing your time in contributing to our project! :sparkles:.
 
-Read our [Code of Conduct](./CODE_OF_CONDUCT.md) to keep our community approachable and respectable.
+Read our [Code of Conduct](../CODE_OF_CONDUCT.md) to keep our community approachable and respectable.
 
 In this guide you will get an overview of the contribution workflow from opening an issue, creating a PR, reviewing, and merging the PR.
 
@@ -39,7 +39,7 @@ Scan through our [existing issues](https://github.com/InvoiceShelf/InvoiceShelf/
 - Using the command line:
   - [Fork the repo](https://docs.github.com/en/get-started/quickstart/fork-a-repo) so that you can make your changes without affecting the original project until you're ready to merge them.
 
-2. Install or update to **Node.js**, at the version specified in `.node-version`. For more information, see [the development guide](../contributing/development.md).
+2. Install or update to **Node.js**, at the version specified in `.node-version`. For more information, see [the development guide](../docker/development/README.md).
 
 3. Create a working branch and start with your changes!
 

docker/development/README.md

@@ -72,7 +72,7 @@ To **spin up** the environment, run docker compose as follows:
 **Important**: If you are on **Linux** and didn't add the `export` line to your .zshrc/.bashrc file, you need to repeat `step 2` before spinning up, otherwise you will face permissions issues.
 
 ```
-docker compose -f .dev/docker-compose.mysql.yml up --build
+docker compose -f docker/development/docker-compose.mysql.yml up --build
 ```
 
 ### 2. Spinning Down
@@ -80,7 +80,7 @@ docker compose -f .dev/docker-compose.mysql.yml up --build
 To **spin down** the environment, run docker compose as follows:
 
 ```
-docker compose -f .dev/docker-compose.mysql.yml down
+docker compose -f docker/development/docker-compose.mysql.yml down
 ```
 
 ### 3. Working with binaries
@@ -88,7 +88,7 @@ docker compose -f .dev/docker-compose.mysql.yml down
 To correctly run `composer`, `npm`, `artisan`, `pint`, `pest` or other binaries within this project, you must ssh into the container as follows:
 
 ```
-docker exec -it invoiceshelf /bin/bash
+docker exec -it invoiceshelf-dev-php /bin/sh
 ```
 
 In the `/var/www/html` directory you can find the application root and run the commands from there.
@@ -114,8 +114,8 @@ The setup parameters/credentials for each of the supported databases are as foll
 | **DB_USER** | invoiceshelf  | invoiceshelf | Not applicable                            |
 | **DB_PASS** | invoiceshelf  | invoiceshelf | Not applicable                            |
 | **DB_NAME** | invoiceshelf  | invoiceshelf | /var/www/html/storage/app/database.sqlite |
-| **DB_HOST** | db-mysql  |  db-pgsql | Not applicable                            |
+| **DB_HOST** | 172.18.0.1  |  172.18.0.1 | Not applicable                            |
-| **DB_PORT** | 3036  | 5432  | Not applicable                            |
+| **DB_PORT** | 3306  | 5432  | Not applicable                            |
 
 **Note:** The only required field for SQLite is **DB_NAME**.
 

docker/development/docker-compose.pgsql.gotenberg.yml

@@ -2,8 +2,8 @@ services:
   php-fpm:
     container_name: invoiceshelf-dev-php
     build:
-      context: ..
+      context: ../../
-      dockerfile: .dev/Dockerfile
+      dockerfile: docker/development/Dockerfile
       args:
         - UID=${USRID:-1000}
         - GID=${GRPID:-1000}
@@ -16,8 +16,8 @@ services:
   nginx:
     container_name: invoiceshelf-dev-nginx
     build:
-      context: ..
+      context: ../../
-      dockerfile: .dev/nginx.Dockerfile
+      dockerfile: docker/development/nginx.Dockerfile
     environment:
       - "PHP_FPM_HOST=php-fpm:9000"
     ports:
@@ -46,8 +46,8 @@ services:
   adminer:
     container_name: invoiceshelf-dev-adminer
     build:
-      context: ./adminer
+      context: ../../
-      dockerfile: Dockerfile
+      dockerfile: docker/development/adminer/Dockerfile
     environment:
       ADMINER_PLUGINS: tables-filter
       ADMINER_DESIGN: konya

docker/development/docker-compose.pgsql.yml

@@ -2,8 +2,8 @@ services:
   php-fpm:
     container_name: invoiceshelf-dev-php
     build:
-      context: ..
+      context: ../../
-      dockerfile: .dev/Dockerfile
+      dockerfile: docker/development/Dockerfile
       args:
         - UID=${USRID:-1000}
         - GID=${GRPID:-1000}
@@ -16,8 +16,8 @@ services:
   nginx:
     container_name: invoiceshelf-dev-nginx
     build:
-      context: ..
+      context: ../../
-      dockerfile: .dev/nginx.Dockerfile
+      dockerfile: docker/development/nginx.Dockerfile
     environment:
       - "PHP_FPM_HOST=php-fpm:9000"
     ports:
@@ -46,8 +46,8 @@ services:
   adminer:
     container_name: invoiceshelf-dev-adminer
     build:
-      context: ./adminer
+      context: ../../
-      dockerfile: Dockerfile
+      dockerfile: docker/development/adminer/Dockerfile
     environment:
       ADMINER_PLUGINS: tables-filter
       ADMINER_DESIGN: konya

docker/development/docker-compose.sqlite.gotenberg.yml

@@ -2,8 +2,8 @@ services:
   php-fpm:
     container_name: invoiceshelf-dev-php
     build:
-      context: ..
+      context: ../../
-      dockerfile: .dev/Dockerfile
+      dockerfile: docker/development/Dockerfile
       args:
         - UID=${USRID:-1000}
         - GID=${GRPID:-1000}
@@ -16,8 +16,8 @@ services:
   nginx:
     container_name: invoiceshelf-dev-nginx
     build:
-      context: ..
+      context: ../../
-      dockerfile: .dev/nginx.Dockerfile
+      dockerfile: docker/development/nginx.Dockerfile
     environment:
       - "PHP_FPM_HOST=php-fpm:9000"
     ports:
@@ -32,13 +32,13 @@ services:
   adminer:
     container_name: invoiceshelf-dev-adminer
     build:
-      context: ./adminer
+      context: ../../
-      dockerfile: Dockerfile
+      dockerfile: docker/development/adminer/Dockerfile
     environment:
       ADMINER_PLUGINS: tables-filter
       ADMINER_DESIGN: konya
     volumes:
-      - ../database:/database
+      - ../../database:/database
     ports:
       - '8080:8080'
     networks:

docker/development/docker-compose.sqlite.yml

@@ -2,8 +2,8 @@ services:
   php-fpm:
     container_name: invoiceshelf-dev-php
     build:
-      context: ..
+      context: ../../
-      dockerfile: .dev/Dockerfile
+      dockerfile: docker/development/Dockerfile
       args:
         - UID=${USRID:-1000}
         - GID=${GRPID:-1000}
@@ -16,8 +16,8 @@ services:
   nginx:
     container_name: invoiceshelf-dev-nginx
     build:
-      context: ..
+      context: ../../
-      dockerfile: .dev/nginx.Dockerfile
+      dockerfile: docker/development/nginx.Dockerfile
     environment:
       - "PHP_FPM_HOST=php-fpm:9000"
     ports:
@@ -32,13 +32,13 @@ services:
   adminer:
     container_name: invoiceshelf-dev-adminer
     build:
-      context: ./adminer
+      context: ../../
-      dockerfile: Dockerfile
+      dockerfile: docker/development/adminer/Dockerfile
     environment:
       ADMINER_PLUGINS: tables-filter
       ADMINER_DESIGN: konya
     volumes:
-      - ../database:/database
+      - ../../database:/database
     ports:
       - '8080:8080'
     networks: