meiri/alkator
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

merge

Browse Source
This commit is contained in:
Angoosh Leviocki 2024-10-24 16:34:18 +02:00
commit af3606da16
Signed by: angoosh
GPG Key ID: 2DAE446D291BD8D3
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
build.sh
View File

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

4
docker-compose.yml
View File

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