Merged master and 1clowd after resolving conflict

portainer.yml

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