sa6kad/GitTest
1
0
Fork 1
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merged master and 1clowd after resolving conflict

Browse Source
This commit is contained in:
AlexD
2023-03-10 15:56:04 +01:00
parent eae4aa5036 f62fe74b7a
commit 04491e66cb
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
portainer.yml
View File

@@ -6,14 +6,14 @@ networks:
services: services:
portainer: portainer:
image: portainer/portainer-ce:alpine image: portainer/portainer-ce # This line was modified in 1clowd branch
container_name: portainer container_name: portainer
volumes: volumes:
- /home/alexd/docker_volumes/portainer/data:/data - /home/alexd/docker_volumes/portainer/data:/data
- /var/run/docker.sock:/var/run/docker.sock - /var/run/docker.sock:/var/run/docker.sock
ports: ports:
- "9800:9000" # This was set in Master - "9900:9000" # This line was modified in 1clowd branch
networks: networks:
infra_out: infra_out:
ipv4_address: 192.168.23.10 ipv4_address: 10.23.0.211 # This line was modified in 1clowd branch
restart: always # This was set in Master restart: unless-stopped