FIX: Fixing broken rebase :D

ADD: Semaphore UI initial commit
2025-08-25 17:55:19 +02:00 · 2025-08-25 17:52:41 +02:00 · 2025-08-25 17:51:00 +02:00
2 changed files with 9 additions and 2 deletions
--- a/semaphore-ui/.env.example
+++ b/semaphore-ui/.env.example
@@ -1,4 +1,11 @@
+<<<<<<< HEAD
 SEMAPHORE_ADMIN=admin
 SEMAPHORE_ADMIN_PASSWORD=changeme
 SEMAPHORE_ADMIN_NAME=Admin
-SEMAPHORE_ADMIN_EMAIL=admin@example.com
+SEMAPHORE_ADMIN_EMAIL=admin@example.com
+=======
+ADMIN_USER=admin
+ADMIN_PASS=changeme
+ADMIN_NAME=Admin
+ADMIN_EMAIL=admin@example.com
+>>>>>>> ab90593 (ADD: Semaphore UI initial commit)
--- a/semaphore-ui/docker-compose.yml
+++ b/semaphore-ui/docker-compose.yml
@@ -14,4 +14,4 @@ services:
            - semaphore-config:/etc/semaphore  
 volumes:
  semaphore-data:
-  semaphore-config:
+  semaphore-config:
Author	SHA1	Message	Date
Maksym Buz	b5ecc227d0	FIX: Fixing broken rebase :D	2025-08-25 17:55:19 +02:00
Maksym Buz	40668b67dc	ADD: Semaphore UI initial commit	2025-08-25 17:52:41 +02:00
Maksym Buz	18c973446d	ADD: Semaphore UI initial commit	2025-08-25 17:51:00 +02:00