FIX: Fixing broken rebase :D
This commit is contained in:
@@ -9,18 +9,9 @@ services:
|
|||||||
SEMAPHORE_ADMIN_PASSWORD: ${ADMIN_PASS}
|
SEMAPHORE_ADMIN_PASSWORD: ${ADMIN_PASS}
|
||||||
SEMAPHORE_ADMIN_NAME: ${ADMIN_NAME}
|
SEMAPHORE_ADMIN_NAME: ${ADMIN_NAME}
|
||||||
SEMAPHORE_ADMIN_EMAIL: ${ADMIN_EMAIL}
|
SEMAPHORE_ADMIN_EMAIL: ${ADMIN_EMAIL}
|
||||||
<<<<<<< HEAD
|
|
||||||
volumes:
|
volumes:
|
||||||
- semaphore-data:/var/lib/semaphore
|
- semaphore-data:/var/lib/semaphore
|
||||||
- semaphore-config:/etc/semaphore
|
- semaphore-config:/etc/semaphore
|
||||||
volumes:
|
volumes:
|
||||||
semaphore-data:
|
semaphore-data:
|
||||||
semaphore-config:
|
semaphore-config:
|
||||||
=======
|
|
||||||
volumes:
|
|
||||||
- /home/mbuz/docker/semaphore/data:/var/lib/semaphore
|
|
||||||
- /home/mbuz/docker/semaphore/config:/etc/semaphore
|
|
||||||
volumes:
|
|
||||||
/home/mbuz/docker/semaphore/data:
|
|
||||||
/home/mbuz/docker/semaphore/config:
|
|
||||||
>>>>>>> 24861aa (ADD: Semaphore UI initial commit)
|
|
||||||
|
|||||||
Reference in New Issue
Block a user