Merge pull request #9 from SimplyEdit/add/multi-platform-build

Change Docker workflow to use buildx

.github/workflows/docker-build.yml

@@ -28,18 +28,22 @@ jobs:
             | tr --complement --squeeze-repeats '[:alnum:]._-' '_')" \
             >> "${GITHUB_ENV}"
 
-      - uses: actions/checkout@v3
-
+      - name: Checkout
+        uses: actions/checkout@v3
+      - name: Set up QEMU
+        uses: docker/setup-qemu-action@v2
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v2
       - name: Login to GitHub Container Registry
         uses: docker/login-action@v2
         with:
           registry: ghcr.io
           username: ${{ github.actor }}
           password: ${{ secrets.GITHUB_TOKEN }}
-
-      - name: Build Docker Image
-        run: |
-          docker build \
-            --tag "ghcr.io/simplyedit/simplycode-docker:${{ env.TAG }}" \
-          .
-          docker push "ghcr.io/simplyedit/simplycode-docker:${{ env.TAG }}"
+      - name: Build and push Docker image
+        uses: docker/build-push-action@v4
+        with:
+          context: .
+          platforms: linux/amd64,linux/arm64
+          push: true
+          tags: "ghcr.io/simplyedit/simplycode-docker:${{ env.TAG }}"

README.md

@@ -40,6 +40,12 @@ docker run \
 
 This will mount the current working directory into the docker image at the right place, and start the SimplyCode server.
 
+When using Docker Desktop, it is advised to use the `--publish-all` flag to make the SimplyCode server available on the host machine.
+
+That way, the SimplyCode server can be accessed by using the "Open in Browser" button in Docker Desktop.
+
+![img.png][1]
+
 ## Contribute
 
 Feedback and contributions are welcome. Please open an issue or pull request.
@@ -66,3 +72,5 @@ Created by [SimplyEdit](https://simplyedit.io) under an MIT License.
 [project-stage-page]: https://blog.pother.ca/project-stages/
 [standard-readme-link]: https://github.com/RichardLitt/standard-readme
 [standard-readme-shield]: https://img.shields.io/badge/-Standard%20Readme-brightgreen.svg
+
+[1]: data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAPcAAAC7CAIAAAA2dJ8TAAAMCklEQVR4Xu2dPaglSRWAXyQGRhMJwjAsDwaWhX3LDvsWBtxEJ3IMlAHRKxpMsozBKpuZGGmygZOsiYEsGMsgBhotLMJGgjKBCBoNstEqGKywwnjePbNnztTpW69udfX9OfM9Ph73dVVXV3d/dfpU377vnlx76VWA3JzERQDJwHLID5ZDfrAc8oPlkB8sh/xgOeQHyyE/WA75wXLID5ZDfrAc8oPlkB8sh/xgOeQHyyE/WA75wXLID5ZDfrAc8oPlkB8sh/xgOeQHyyE/WA75wXLID5ZDfrAc8oPlkB8sh/xgOeQHyyE/WA75wXLID5ZDfrAc8oPlkB8sh/xgOeQHyyE/WA75SWv5Cy+/JtgLeJ5JaHncSXjOyWN53LfTV14HEBJaHncSnnOSWD6p+PUbNwGEk7Mv3wLIDZZDfrAc8oPlkB8sh/xgOeQHyyE/WA75wXLID5ZDfrAc8oPlkB8sh/xgOeQHyyE/WA75wXLID5ZDfrAc8oPlkB8sh/xgOeQHyyE/WA75wXLID5bvk/Ovf+f2T34prN77ULj3wX+Eu7/9uyB/3rn/4NZbP4trHSant9++euedL67eu3L394K8EGSJLH/xq9+N9XcJlu8Bldu0vhSRXurLWrGpvSMef+EHfz758eM6Ukdq7kt3LN8p6nf0uAV1Pba5F8TXFrkjEuZ37zqW745Jv9XdN773Q0GryUgQ5E9JV2K8PwTXxdRJfQUJ2JqlCJq0yGD43Nsfxcq7dB3Ld4FYW/jaLqusG3WX1feSwIi70VfROtaMK0bdZWGsuQRYvjiiYyFo35xS1pJ19yi6BOaZ8Vjqy1re9ZYRMh8sXxZJPLzijfF7E0Va3z1gOvBZuLyeE4ZlXS+6DJ5tR8u2YPmCeMXFSMu8Z+IvDgObreCjuCgeK3Tgk3tpP1YYCJYvhbhoCcbw7GLRxgt8Lj5WRz94xrZcgOVL4eeLS4TbIqLHCkPwikv0jRVm4kVfLm/B8kXw2fMSiis+I5qZ8W/CEuhRiUrENiEvlhD9YiDFpTCfpeUzZPa5XDi3QCv+xdKBmOhL5C0XLcelMJM79x8sZ16BvxMv240V5mC5xBLyefxwGhvOn8xxYwHMpCVX0XuCHv/eZ1FUVCiwvGXsNHRngVxZKJw/GaixAOZgKYSE2Fhq2EgwfG7j0/rJCgUWzit1tsW0m3NrvB2b5g6cAFy98w6WL4IJV3m/xkZCReIoesVgC+f1odWOpA2NgXzgm5c2rkYlLU/fyYplMAeTspI8RIMnJbb8flMFw99VrGy3HUtX6vmDZr2j7jDa+0SjRs4TxbF8LBak6xNBb3ksVfy08lLLz9quIe1YFKykK/7NyyGij01aLF256Gcshm4s+tZVu9RyU1wfXWyx3KrVB1gjpm8sMiyrGSi6NnVpmtSCvzJg+UiGWO4V9/Xrlo9NzRttGy66peaxaFuwfCns2ZJ6clyxPCpuq+zM8vapp688RHTLlOZPQP1cFstHMtPyTYpbaVzoS7XByXW3wsRtzI8L0esT1joWgCvzgUawfCkm3Y1sslwTnm5NJ9vswGaBjYHZP3oubs0RdKDl1qWL17EYuhkSy2P9Ribb7GCrWF5R/EvfevfK+sOgkU0JCRnLEWC38za9G69ssnwSzchvb36HXxmYl581zz4rip+tLbfSgk0SD5x9+puhWD6SJSy3mvXZZ+Ot+kZabLPs4mRK8bMuy621WLQtWL4UdiexbuQRWb5Jx7N1YqPVJhU/W1v++bf+Mclks1vd27kUG4Q8Xz6Yxke1lrB87Hufje/wv7j+30OTinfQuNFG7L3Pi6Aei6Gbxtt53vJ26pZbtfrEt5Gxb7Y3YheQIcPGXxmwfDAtqXmf5ZUgPTZdUVqSloGMTVcUnklcCjO4krT4RwjbqQTpsemKYvlD413zmfg0Opb2YbuA5YPxBlfC+fn6/8LZXcJLiS0Y/mn1ykjYFptc7iCcWyA/qd7V2ZanzcYymMkuP/d55gL5wHRFsVgol/5FRbfUYmAgV55cImIBzMSH83oYno8lSPcabtd0YOF8uH/Goh8wfRLOYwHMx7KIu0v+h7cd/D+Wp6ntMqI//WjmuI8IFfDk7VLY04Uq+sB02fBXjMpMdz5e9CH3+Ay7X7nQEFIuwnlcCkM4X/JfGRajKFYYi39eZZSOfvAsfVceyxfEh9u74/4Ls09U7lXv5AzEEnQVfeZk1A+bpRU/w/Kl8bf57jZ//0QFP93cmeJK8XhW37dhyVp+wOxA8TMs3wE+dZkT1EXoop1dKq74NEMdbXe98PtkXPJzKVi+C3wava3r51Nfm7jodLPO6bPfJGG6i7Kn6y/NUunl9+n6G0CvTn1V4sBnvFrA8h2hsnpT1XXxVXR/Y/0dcTpDPf/sO+Ki3LrK/LRnPjEwN7LpMd1FwfKdMul6O4fgt+d06pvfNnGl7dvklgDL98D51JcbVtD4PfZe5FhO19/uKR6L9Oq9/NaPeGomE1fZJVi+T1T3O/cfiPGCTi7lt2YysvzQgveRguWQHyyH/GA55AfLIT9YDvnBcsgPlkN+sBzyg+WQHyyH/GA55AfLIT9YDvnBcsgPlkN+sBzyg+WQHyyH/GA55AfLIT9YDvk5FMu/8o1vf/P7b67e/BE854gGIkM0ZA4HYTl+Q4EoET3pZv+WozhMMlD0PVsu16a4ewDKqNRlz5YTyKHCqHB+cu2lV/dI3DEAz/UbN+eD5XDQnL7y+nywHA6aqGwHWA4HzQsvvzYfLIeDJirbwTFZ/vCvf3vsft7/44dFhd/87g+ffvo/qyCvZYmv8OifH7kGLn58I1paNCsb/eST//7iV78utmXoRv1a2k/57atJhdgfj2xCNuT79vG//v3Tn7/r6xT9jxVitWKjUl/Wkgq2RPvvl2hPfP+l826zj33l4qQ8fnbHi9L6kZwkOtPBcViu58aOoP3pD/fqWeGsTuHxJjO0NJ6JbssLvRotN0VUrKK3vv+63aKCDRXtj/3pzSsOgm7I72OxR1rBDrW8KDyuHB9fqp2pVJ4kOtPBcViu3sQoW3hTnB49rH4kXGq5lBaBrX4WV2Gjuoq0I2sVMm1lubZTrBIFjRXiVmSh34ViLW1TKtguFLtcP2j141OUxmN1KdGZDo7Aco3K8UBHiYuDGK/O9RMmpRqovAT1s7gKG9VVZCsaAn1EjP55Ji0vNl23PB4QRXtoLfsO6yHSDluFYiuxG56tSuOxupToTAdHYHk8/Uq0fzKW+xVbLC+arZ/FVdiorqKr+yC6reXabKGs77+OosogL1q2mn7wyypSJL+tz/GgabPxWqrUj48v1XYqx3+S6EwHR2B5EYqMuuX6uhDr0bOztxgp9dyrQLrF+lm0DU1a7k1ttNx3LwpR9L/QTrsdXYwx3kaLddW6F3dn5SY5j8Os+uGz88tiH4vSeBIvJTrTwRFYHqOLsslyO6bRzpZYbq919TmW62s98Y2W+918FJJs63+svJrqiW/ZW26dsV3WOrK8vr86zHxT9fpW6i8gWxGd6eAILI82K/HkbTrNRrvl1nj9LK6mNuott853WK4tF97H8VO0EE2K7WjNP/3loZptjRtFC57igNSPjy/ddKmpE53p4AgsX02d0cmFUbiCdstXLvGtnMXV1Ea95Vbh4/V9jIGWTzo92du40Mae4H3VJX6LkW7LN0WrOtGZDo7Dcj1AltgVfxpRuIKtLLetVM7iamqjheWrzy70caB6Csu12WLTRf/jONdGLGQWf3oerjPmOBqLBvUg2GGxke/bqRyforQjnEdnOjgOyxU9MfozaUwUrkBt8z++cmG5NVg5i1anbrnaNtnnoo7vW9xuYfmm6Oh3MzaiqHA+TGhrsX5x0IrI4k9KrBDHQLyw1InOdHBMlsNzSHSmAyyHgyY60wGWw0ETnekAy+Ggic50gOVw0ERnOtiz5XyGHyqIHtGZDvZs+c1bX4v7BqCIHtGZDvZs+TXCOWxgVCC/dgiWX79xE9GhQJQQMaItfezfckWuTbgOq7XfoxIV41AsB1gOLIf8YDnkB8shPyeS6QPkhlgO+cFyyA+WQ36wHPKD5ZAfLIf8YDnkB8shP1gO+cFyyA+WQ36wHPKD5ZCf/wMVbF7BowpW/wAAAABJRU5ErkJggg==

entrypoint.sh

@@ -50,8 +50,8 @@ EOF
 }
 
 defaultCommand() {
-    groupmod --gid "${USER_GID}" 'www-data'
-    usermod --gid "${USER_GID}" --uid "${USER_ID}" 'www-data'
+    groupmod --gid "${USER_GID}" 'www-data' || true
+    usermod --gid "${USER_GID}" --uid "${USER_ID}" 'www-data' || true
 
     apache2-foreground
 }
@@ -68,6 +68,31 @@ entrypoint() {
     fi
 }
 
+guessUrl(){
+    local hasHost isSetFromFile url
+
+    hasHost="$(getent 'hosts' 'host.docker.internal' | awk '{ print $1 }')"
+    isSetFromFile="$(grep 'docker.internal'  /etc/hosts | awk '{ print $1 }')"
+
+    # host.docker.internal is not available on Linux, it is set in /etc/hosts
+    # If `host.docker.internal` is available and not set in /etc/hosts,
+    # we are in Docker Desktop for Mac or Windows.
+    # If it is not available, or is available but set in /etc/hosts, we are on
+    # Linux.
+
+    if [ "${hasHost}" == 'host.docker.internal' ] && [ "${isSetFromFile}" != 'host.docker.internal' ]; then
+        # we are on Docker Desktop for Mac or Windows
+        url='Docker Desktop'
+    else
+        # we are on Linux
+        url="https://$(tail -n1 /etc/hosts | cut -f1)"
+        if [ ! -f '/var/www/www/api/data/generated.html' ]; then
+            url="${url}/simplycode/"
+        fi
+    fi
+
+    echo "${url}"
+}
 runChecks() {
     local pass=true
     local url
@@ -86,10 +111,8 @@ runChecks() {
         find /var/www/www/api/data -maxdepth 1 -type d -exec echo -e "\t{}/" \;
         find /var/www/www/api/data -maxdepth 1 -type f -exec echo -e "\t{}" \;
 
-        url="https://$(tail -n1 /etc/hosts | cut -f1)"
-        if [ ! -f '/var/www/www/api/data/generated.html' ]; then
-            url="${url}/simplycode/"
-        fi
+        url="$(guessUrl)"
+        readonly url
 
         echo -e "Running on $(tput setaf 7)${url}$(tput sgr 0)\n"
     fi