Merge pull request #57 from robinlehrmann/hotfix/support-apple-arm-platform

feat: ARM support

Author: s4mpl3d

commands/system/env.sh

@@ -14,6 +14,7 @@ function system:env() {
     echo HELPER_DIR=${HELPER_DIR}
     echo NETWORK_NAME=${NETWORK_NAME}
     echo DOCKER_BUILDKIT=${DOCKER_BUILDKIT}
+    echo DOCKER_DEFAULT_PLATFORM=${DOCKER_DEFAULT_PLATFORM}
     echo DDE_UID=${DDE_UID}
     echo DDE_GID=${DDE_GID}
     echo ""

dde.sh

@@ -13,11 +13,14 @@ NETWORK_NAME=dde
 DOCKER_BUILDKIT=1
 DDE_UID=$(id -u)
 DDE_GID=$(id -g)
+DOCKER_DEFAULT_PLATFORM=$(uname -m | sed 's/x86_64/linux\/amd64/; s/arm64/linux\/arm64/')
 DDE_BROWSER=
 DDE_CONTAINER_SHELL=sh
 export DDE_UID
 export DDE_GID
 export DDE_CONTAINER_SHELL
+export DOCKER_DEFAULT_PLATFORM
+
 # If we're running in CI we need to disable TTY allocation for docker-compose
 # commands that enable it by default, such as exec and run.
 TTY=""

docker-compose.yml

@@ -2,7 +2,7 @@ version: "3.4"
 
 services:
     dnsmasq:
-        image: andyshinn/dnsmasq
+        image: 4km3/dnsmasq:2.85-r2
         restart: unless-stopped
         cap_add:
             - NET_ADMIN