From 99639b9844fdb262c91f1a4de74e5c6c086a1c39 Mon Sep 17 00:00:00 2001
From: Alejandro Celaya <alejandrocelaya@gmail.com>
Date: Sun, 27 Oct 2024 08:36:57 +0100
Subject: [PATCH] Depend on actual versions for shlink packages

---
 .gitattributes                   |  1 -
 .gitignore                       |  1 -
 CONTRIBUTING.md                  |  6 ------
 composer.json                    |  4 ++--
 docker-compose.override.yml.dist | 30 ------------------------------
 docker-compose.yml               |  5 +++++
 6 files changed, 7 insertions(+), 40 deletions(-)
 delete mode 100644 docker-compose.override.yml.dist

diff --git a/.gitattributes b/.gitattributes
index 4d66fe58..a34ddbf9 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -13,7 +13,6 @@
 .travis.yml export-ignore
 build.sh export-ignore
 CHANGELOG.md export-ignore
-docker-compose.override.yml.dist export-ignore
 docker-compose.yml export-ignore
 indocker export-ignore
 phpcs.xml export-ignore
diff --git a/.gitignore b/.gitignore
index 04c8ed56..9353d40c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -12,6 +12,5 @@ data/GeoLite2-City.*
 data/infra/matomo
 docs/swagger-ui*
 docs/mercure.html
-docker-compose.override.yml
 .phpunit.result.cache
 docs/swagger/swagger-inlined.json
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index e44c5fee..daf34a63 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -24,12 +24,6 @@ Then you will have to follow these steps:
 
     The `shlink_dev_env.php` file is gitignored, so you can customize it as you want. For example, by adding your own GeoLite license key.
 
-* Do the same with the `docker-compose.override.yml.dist`:
-
-    ```
-    cp docker-compose.override.yml.dist docker-compose.override.yml
-    ```
-
 * Start-up the project by running `docker compose up`.
 
     The first time this command is run, it will create several containers that are used during development, so it may take some time.
diff --git a/composer.json b/composer.json
index e1e072a2..49872457 100644
--- a/composer.json
+++ b/composer.json
@@ -44,12 +44,12 @@
         "pagerfanta/core": "^3.8",
         "ramsey/uuid": "^4.7",
         "shlinkio/doctrine-specification": "^2.1.1",
-        "shlinkio/shlink-common": "dev-main#16d19b7 as 6.4",
+        "shlinkio/shlink-common": "^6.4",
         "shlinkio/shlink-config": "^3.3",
         "shlinkio/shlink-event-dispatcher": "^4.1",
         "shlinkio/shlink-importer": "^5.3.2",
         "shlinkio/shlink-installer": "^9.2",
-        "shlinkio/shlink-ip-geolocation": "dev-main#6f35bd4 as 4.1",
+        "shlinkio/shlink-ip-geolocation": "^4.1",
         "shlinkio/shlink-json": "^1.1",
         "spiral/roadrunner": "^2024.1",
         "spiral/roadrunner-cli": "^2.6",
diff --git a/docker-compose.override.yml.dist b/docker-compose.override.yml.dist
deleted file mode 100644
index 85e58554..00000000
--- a/docker-compose.override.yml.dist
+++ /dev/null
@@ -1,30 +0,0 @@
-services:
-    shlink_php:
-        user: 1000:1000
-        volumes:
-            - /etc/passwd:/etc/passwd:ro
-            - /etc/group:/etc/group:ro
-
-    shlink_roadrunner:
-        user: 1000:1000
-        volumes:
-            - /etc/passwd:/etc/passwd:ro
-            - /etc/group:/etc/group:ro
-
-    shlink_db_mysql:
-        user: 1000:1000
-        volumes:
-            - /etc/passwd:/etc/passwd:ro
-            - /etc/group:/etc/group:ro
-
-    shlink_db_postgres:
-        user: 1000:1000
-        volumes:
-            - /etc/passwd:/etc/passwd:ro
-            - /etc/group:/etc/group:ro
-
-    shlink_db_maria:
-        user: 1000:1000
-        volumes:
-            - /etc/passwd:/etc/passwd:ro
-            - /etc/group:/etc/group:ro
diff --git a/docker-compose.yml b/docker-compose.yml
index 050e6803..2b8d1b56 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -13,6 +13,7 @@ services:
 
     shlink_php:
         container_name: shlink_php
+        user: 1000:1000
         build:
             context: .
             dockerfile: ./data/infra/php.Dockerfile
@@ -40,6 +41,7 @@ services:
 
     shlink_roadrunner:
         container_name: shlink_roadrunner
+        user: 1000:1000
         build:
             context: .
             dockerfile: ./data/infra/roadrunner.Dockerfile
@@ -66,6 +68,7 @@ services:
 
     shlink_db_mysql:
         container_name: shlink_db_mysql
+        user: 1000:1000
         image: mysql:8.0
         ports:
             - "3307:3306"
@@ -78,6 +81,7 @@ services:
 
     shlink_db_postgres:
         container_name: shlink_db_postgres
+        user: 1000:1000
         image: postgres:16.3-alpine
         ports:
             - "5434:5432"
@@ -91,6 +95,7 @@ services:
 
     shlink_db_maria:
         container_name: shlink_db_maria
+        user: 1000:1000
         image: mariadb:10.7
         ports:
             - "3308:3306"