merge

added build and push scripts
2024-10-24 16:34:18 +02:00 · 2024-10-24 16:11:15 +02:00
2 changed files with 7 additions and 1 deletions
--- a/build.sh
+++ b/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
--- a/push.sh
+++ b/push.sh
@ -0,0 +1,2 @@
+#!/bin/bash
+docker push gitea.angoosh.com/meiri/alkator/api:latest
Author	SHA1	Message	Date
Angoosh Leviocki	af3606da16	merge	2024-10-24 16:34:18 +02:00
Angoosh Leviocki	ba0e125a13	added build and push scripts	2024-10-24 16:11:15 +02:00