merge

build.sh

@@ -1,2 +1,6 @@
 #!/bin/bash
+<<<<<<< HEAD
 docker build -t gitea.angoosh.com/meiri/alkator/api:latest .
+=======
+docker build -t gitea.angoosh.com/meiri/alkator/api:latest .
+>>>>>>> 00274fd0333fe8c95787df3a11cbeda3b72432a4

docker-compose.yml

@@ -8,9 +8,9 @@ services:
     networks:
       - alkator
   nginx:
-    image: nginx
+    image: nginx:1.27.2
     ports:
-      - "80:80"
+      - "8004:80"
     volumes:
       - /home/meiri/alkator/nginx.conf:/etc/nginx/nginx.conf:ro
       - /home/meiri/alkator/:/alkator