Merge pull request #63 from thin-edge/chore-update-te-remove-workarounds

chore: remove workarounds after related tickets have been merged
thin-edge · Dec 16, 2023 · 5f97635 · 5f97635 · github-actions · Dec 16, 2023
2 parents dd6afc4 + 1fac462
commit 5f97635
Show file tree

Hide file tree

Showing 4 changed files with 0 additions and 38 deletions.
diff --git a/demos/docker-compose/tedge-containermgmt/docker-compose.yaml b/demos/docker-compose/tedge-containermgmt/docker-compose.yaml
@@ -9,9 +9,6 @@ x-device-defaults: &defaults
     - /tmp
   depends_on:
     - mqtt-broker
-  environment:
-    # Remove once: https://github.com/thin-edge/thin-edge.io/issues/2523
-    - TEDGE_ENABLE_SUDO=false
   # root is required in the default docker setup
   user: root
 
@@ -50,8 +47,6 @@ services:
       - TEDGE_C8Y_URL=${C8Y_DOMAIN:-}
     volumes:
       - device-certs:/etc/tedge/device-certs
-      # Remove once https://github.com/thin-edge/thin-edge.io/issues/2477 is resolved
-      - tedge-data:/var/tedge
 
   # main device
   tedge:
@@ -60,8 +55,6 @@ services:
     volumes:
       # Enable docker from docker - But then this container has elevated access to system resources!
       - /var/run/docker.sock:${DOCKER_SOCKET:-/var/run/docker.sock}:rw
-      # Remove once https://github.com/thin-edge/thin-edge.io/issues/2477 is resolved
-      - tedge-data:/var/tedge
 
   # monitor container/container-groups and add services on the main device
   tedge-container-monitor:
@@ -75,5 +68,3 @@ volumes:
   device-certs:
   mosquitto:
   mosquitto-conf:
-  # Remove once https://github.com/thin-edge/thin-edge.io/issues/2477 is resolved
-  tedge-data:
diff --git a/demos/docker-compose/tedge/docker-compose.yaml b/demos/docker-compose/tedge/docker-compose.yaml
@@ -9,9 +9,6 @@ x-device-defaults: &defaults
     - /tmp
   depends_on:
     - mqtt-broker
-  environment:
-    # Remove once: https://github.com/thin-edge/thin-edge.io/issues/2523
-    - TEDGE_ENABLE_SUDO=false
 
 services:
   bootstrap:
@@ -48,16 +45,11 @@ services:
       - TEDGE_C8Y_URL=${C8Y_DOMAIN:-}
     volumes:
       - device-certs:/etc/tedge/device-certs
-      # Remove once https://github.com/thin-edge/thin-edge.io/issues/2477 is resolved
-      - tedge-data:/var/tedge
 
   # main device
   tedge:
     <<: *defaults
     command: ["/usr/bin/tedge-agent", "--mqtt-device-topic-id", "device/main//"]
-    volumes:
-      # Remove once https://github.com/thin-edge/thin-edge.io/issues/2477 is resolved
-      - tedge-data:/var/tedge
 
   # child devices
   child01:
@@ -68,5 +60,3 @@ volumes:
   device-certs:
   mosquitto:
   mosquitto-conf:
-  # Remove once https://github.com/thin-edge/thin-edge.io/issues/2477 is resolved
-  tedge-data:
diff --git a/images/tedge-containermgmt/docker-compose.yaml b/images/tedge-containermgmt/docker-compose.yaml
@@ -11,9 +11,6 @@ x-device-defaults: &defaults
     - /tmp
   depends_on:
     - mqtt-broker
-  environment:
-    # Remove once: https://github.com/thin-edge/thin-edge.io/issues/2523
-    - TEDGE_ENABLE_SUDO=false
   # root is required in the default docker setup
   user: root
 
@@ -52,8 +49,6 @@ services:
       - TEDGE_C8Y_URL=${C8Y_DOMAIN:-}
     volumes:
       - device-certs:/etc/tedge/device-certs
-      # Remove once https://github.com/thin-edge/thin-edge.io/issues/2477 is resolved
-      - tedge-data:/var/tedge
 
   # main device
   tedge:
@@ -62,8 +57,6 @@ services:
     volumes:
       # Enable docker from docker - But then this container has elevated access to system resources!
       - /var/run/docker.sock:${DOCKER_SOCKET:-/var/run/docker.sock}:rw
-      # Remove once https://github.com/thin-edge/thin-edge.io/issues/2477 is resolved
-      - tedge-data:/var/tedge
 
   # monitor container/container-groups and add services on the main device
   tedge-container-monitor:
@@ -77,5 +70,3 @@ volumes:
   device-certs:
   mosquitto:
   mosquitto-conf:
-  # Remove once https://github.com/thin-edge/thin-edge.io/issues/2477 is resolved
-  tedge-data:
diff --git a/images/tedge/docker-compose.yaml b/images/tedge/docker-compose.yaml
@@ -11,9 +11,6 @@ x-device-defaults: &defaults
     - /tmp
   depends_on:
     - mqtt-broker
-  environment:
-    # Remove once: https://github.com/thin-edge/thin-edge.io/issues/2523
-    - TEDGE_ENABLE_SUDO=false
 
 services:
   bootstrap:
@@ -50,16 +47,11 @@ services:
       - TEDGE_C8Y_URL=${C8Y_DOMAIN:-}
     volumes:
       - device-certs:/etc/tedge/device-certs
-      # Remove once https://github.com/thin-edge/thin-edge.io/issues/2477 is resolved
-      - tedge-data:/var/tedge
 
   # main device
   tedge:
     <<: *defaults
     command: ["/usr/bin/tedge-agent", "--mqtt-device-topic-id", "device/main//"]
-    volumes:
-      # Remove once https://github.com/thin-edge/thin-edge.io/issues/2477 is resolved
-      - tedge-data:/var/tedge
 
   # child devices
   child01:
@@ -70,5 +62,3 @@ volumes:
   device-certs:
   mosquitto:
   mosquitto-conf:
-  # Remove once https://github.com/thin-edge/thin-edge.io/issues/2477 is resolved
-  tedge-data: