Remove docker compose override

shlinkio · Oct 27, 2024 · 57bac8c · 57bac8c
1 parent c6e1aa9
commit 57bac8c
Show file tree

Hide file tree

Showing 4 changed files with 1 addition and 8 deletions.
diff --git a/.gitattributes b/.gitattributes
@@ -5,7 +5,6 @@ test-resources export-ignore
 .gitignore export-ignore
 .phpstorm.meta.php export-ignore
 CHANGELOG.md export-ignore
-docker-compose.override.yml.dist export-ignore
 docker-compose.yml export-ignore
 Dockerfile export-ignore
 indocker export-ignore

diff --git a/.gitignore b/.gitignore
@@ -2,5 +2,4 @@
 build
 composer.lock
 vendor/
-docker-compose.override.yml
 config/*.local.php
diff --git a/docker-compose.override.yml.dist b/docker-compose.override.yml.dist
diff --git a/docker-compose.yml b/docker-compose.yml
@@ -1,6 +1,7 @@
 services:
   shlink_common_php:
     container_name: shlink_common_php
+    user: 1000:1000
     build:
       context: .
     volumes: