Fix docker image

Author: lucasssvaz

tools/config_editor/app.py

@@ -103,6 +103,7 @@ class ConfigEditorApp(App):
     # Options to be set by the command line arguments
     setting_target = ""
     setting_arduino_path = ""
+    setting_arduino_permissions = ""
     setting_arduino_branch = ""
     setting_idf_branch = ""
     setting_idf_commit = ""
@@ -199,6 +200,13 @@ def main() -> None:
                         required=False,
                         help="Path to arduino-esp32 directory. Default: " + arduino_default_path())
 
+    parser.add_argument("-p", "--arduino-permissions",
+                        metavar="<uid:gid>",
+                        type=str,
+                        default="",
+                        required=False,
+                        help=argparse.SUPPRESS) # Hidden option. It is only supposed to be used by the docker container
+
     parser.add_argument("-A", "--arduino-branch",
                         metavar="<arduino branch>",
                         type=str,
@@ -267,6 +275,7 @@ def main() -> None:
 
     # Set the other options
     app.setting_arduino_path = os.path.abspath(args.arduino_path)
+    app.setting_arduino_permissions = args.arduino_permissions
     app.setting_arduino_branch = args.arduino_branch
     app.setting_idf_branch = args.idf_branch
     app.setting_idf_commit = args.idf_commit

tools/config_editor/compile.py

@@ -1,6 +1,7 @@
 import sys
 import subprocess
 import os
+import re
 
 from rich.console import RenderableType
 
@@ -138,6 +139,20 @@ def compile_libs(self) -> None:
                 print("Error reading child process errors: " + str(e))
             label.update("Compilation failed for " + target)
         else:
+            regex = r"^[1-9][0-9]*:[1-9][0-9]*$"  # Regex to match the line:column format
+            if self.app.setting_arduino_permissions and re.match(regex, self.app.setting_arduino_permissions):
+                chown_process = None
+                try:
+                    chown_process = subprocess.run(["chown", "-R", self.app.setting_arduino_permissions, self.app.setting_arduino_path])
+                except Exception as e:
+                    print("Error changing permissions: " + str(e))
+
+                if chown_process and chown_process.returncode != 0:
+                    self.print_error("Error changing permissions.")
+                    self.print_error("Please change the ownership of generated files manually")
+                else:
+                    self.print_success("Permissions changed successfully")
+
             self.print_success("Compilation successful for " + target)
             label.update("Compilation successful for " + target)
 

tools/docker/Dockerfile

@@ -37,13 +37,6 @@ RUN : \
   && rm -rf /var/lib/apt/lists/* \
   && :
 
-# install gosu for a better su+exec command
-ARG GOSU_VERSION=1.17
-RUN dpkgArch="$(dpkg --print-architecture | awk -F- '{ print $NF }')" \
- && wget -O /usr/local/bin/gosu "https://github.com/tianon/gosu/releases/download/$GOSU_VERSION/gosu-$dpkgArch" \
- && chmod +x /usr/local/bin/gosu \
- && gosu nobody true
-
 # To build the image for a branch or a tag of the lib-builder, pass --build-arg LIBBUILDER_CLONE_BRANCH_OR_TAG=name.
 # To build the image with a specific commit ID of lib-builder, pass --build-arg LIBBUILDER_CHECKOUT_REF=commit-id.
 # It is possibe to combine both, e.g.:
@@ -60,7 +53,6 @@ ARG LIBBUILDER_CLONE_SHALLOW_DEPTH=1
 ARG LIBBUILDER_TARGETS=all
 
 ENV LIBBUILDER_PATH=/opt/esp/lib-builder
-ENV ARDUINO_PATH=/opt/esp/lib-builder/arduino-esp32
 # Ccache is installed, enable it by default
 ENV IDF_CCACHE_ENABLE=1
 
@@ -83,4 +75,4 @@ COPY entrypoint.sh $LIBBUILDER_PATH/entrypoint.sh
 
 WORKDIR /opt/esp/lib-builder
 ENTRYPOINT [ "/opt/esp/lib-builder/entrypoint.sh" ]
-CMD [ "python3", "tools/config_editor/app.py" ]
+CMD [ "python3", "tools/config_editor/app.py", "-c", "/arduino-esp32" ]

tools/docker/entrypoint.sh

@@ -15,19 +15,9 @@ then
 	done
 fi
 
-if [ "$(id -u)" = "0" ] && [ -n "${HOST_UID}" ]; then
-	groupadd -g ${HOST_UID} host_user
-	useradd -m -u ${HOST_UID} -g ${HOST_UID} host_user
-
-	if [ -d /arduino-esp32 ]; then
-		chown -R ${HOST_UID}:${HOST_UID} /arduino-esp32
-	fi
-
-	chown -R ${HOST_UID}:${HOST_UID} /opt/esp
+exec "$@"
 
-	# Add call to gosu to drop from root user to host_user
-	# when running original entrypoint
-	set -- gosu host_user "$@"
+if [ -d /arduino-esp32 ]; then
+	echo "Fixing permissions on /arduino-esp32"
+	chown -R `stat -c "%u:%g" /arduino-esp32` /arduino-esp32
 fi
-
-exec "$@"