Merged master and 1clowd after resolving conflict

file1.txt

@@ -1,2 +0,0 @@
-File1: line 1
-File1: line 2

file2.txt

@@ -1 +0,0 @@
-File2: line1

firefox.yml

@@ -0,0 +1,26 @@
+version: '3'
+
+networks:
+  vpn_uplink:
+    external: true
+  behind_proxy:
+    external: true
+
+services:
+  firefox:
+    image: lscr.io/linuxserver/firefox
+    container_name: firefox
+    environment:
+      - PUID=1002
+      - PGID=1002
+      - TZ=Europe/Stockholm
+    volumes:
+      - /home/ubuntu/docker_volumes/firefox/config:/config
+    ports:
+      - 4000:3000
+    shm_size: "1gb"
+    networks:
+      vpn_uplink:
+          ipv4_address: 10.23.0.222
+      behind_proxy:
+    restart: unless-stopped

portainer.yml

@@ -0,0 +1,19 @@
+version: '3'
+
+networks:
+  infra_out:
+    external: true
+
+services:
+  portainer:
+    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:
+      - "9900:9000" # This line was modified in 1clowd branch
+    networks:
+      infra_out:
+        ipv4_address: 10.23.0.211 # This line was modified in 1clowd branch
+    restart: unless-stopped