Hithomelabs/CFTunnels#150: Resolve merge conflict in portainer_automation_build_push.yml (keep pa- prefix with ASCII arrows)
All checks were successful
sample gradle build and test / build (pull_request) Successful in 1m49s
Daily cloudflare API integration test / cloudflare-api-test (push) Successful in 1m46s
Build & Push Portainer Automation / version (push) Successful in 7s
Build & Push Portainer Automation / build-and-push (push) Successful in 29s
Build & Push CFTunnels / version (push) Successful in 7s
Build & Push CFTunnels / build-and-push (push) Successful in 30s
All checks were successful
sample gradle build and test / build (pull_request) Successful in 1m49s
Daily cloudflare API integration test / cloudflare-api-test (push) Successful in 1m46s
Build & Push Portainer Automation / version (push) Successful in 7s
Build & Push Portainer Automation / build-and-push (push) Successful in 29s
Build & Push CFTunnels / version (push) Successful in 7s
Build & Push CFTunnels / build-and-push (push) Successful in 30s
This commit is contained in:
commit
f1c9965396
@ -30,15 +30,3 @@ services:
|
||||
- "${DB_PORT}:5432"
|
||||
volumes:
|
||||
- ${DB_PATH}:/var/lib/postgresql/data
|
||||
portainer-automation:
|
||||
image: gitea.hithomelabs.com/hithomelabs/portainer-automation:${ENV}
|
||||
container_name: portainer-automation_${ENV}
|
||||
ports:
|
||||
- "${PORTAINER_AUTOMATION_PORT:-8081}:8081"
|
||||
environment:
|
||||
- SPRING_PROFILES_ACTIVE=${SPRING_PROFILES_ACTIVE:-local}
|
||||
- PORTAINER_API_KEY=${PORTAINER_API_KEY}
|
||||
- PORTAINER_SERVICE_API_KEY=${PORTAINER_SERVICE_API_KEY}
|
||||
env_file:
|
||||
- stack.env
|
||||
restart: unless-stopped
|
||||
Loading…
Reference in New Issue
Block a user