RFC: remove ./docker-compose

Signed-off-by: Florian Scherf <[email protected]>
lona-web-org · May 29, 2023 · 2b2dbdd · 2b2dbdd
1 parent 53c35a8
commit 2b2dbdd
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 12 deletions.
diff --git a/Makefile b/Makefile
@@ -25,16 +25,16 @@ freeze: | $(PYTHON_ENV)
 
 # tests #######################################################################
 test:
-	./docker-compose run playwright tox $(args)
+	docker-compose run playwright tox $(args)
 
 ci-test:
-	./docker-compose run playwright tox -e lint,py37,py38,py39,py310,py311 $(args)
+	docker-compose run playwright tox -e lint,py37,py38,py39,py310,py311 $(args)
 
 lint:
-	./docker-compose run playwright tox -e lint $(args)
+	docker-compose run playwright tox -e lint $(args)
 
 isort:
-	./docker-compose run playwright tox -e isort $(args)
+	docker-compose run playwright tox -e isort $(args)
 
 # packaging ###################################################################
 dist: | $(PYTHON_ENV)

diff --git a/docker-compose b/docker-compose
diff --git a/docker-compose.yml b/docker-compose.yml
@@ -6,11 +6,14 @@ networks:
 
 services:
     playwright:
-        user: ${DOCKER_USER}
+        user: 1000:1000
 
         build:
             context: ./
             dockerfile: playwright.Dockerfile
+            args:
+                - UID=${UID:-1000}
+                - GID=${GID:-1000}
 
         networks:
             - net

diff --git a/playwright.Dockerfile b/playwright.Dockerfile
@@ -1,5 +1,7 @@
 FROM mcr.microsoft.com/playwright:v1.34.0-jammy
 
+ARG UID=1000 GID=1000
+
 # upgrade ubuntu
 RUN apt update && apt upgrade -y