Просмотр исходного кода

fix(Dockerfile): create /home/noroot directory and change ownership of it

lanvent 2 лет назад
Родитель
Сommit
2133c1d6af
3 измененных файлов с 5 добавлено и 3 удалено
  1. 2 1
      docker/Dockerfile.debian
  2. 2 1
      docker/Dockerfile.latest
  3. 1 1
      plugins/plugin_manager.py

+ 2 - 1
docker/Dockerfile.debian

@@ -31,9 +31,10 @@ WORKDIR ${BUILD_PREFIX}
 ADD ./entrypoint.sh /entrypoint.sh
 
 RUN chmod +x /entrypoint.sh \
+    && mkdir -p /home/noroot \
     && groupadd -r noroot \
     && useradd -r -g noroot -s /bin/bash -d /home/noroot noroot \
-    && chown -R noroot:noroot ${BUILD_PREFIX}
+    && chown -R noroot:noroot /home/noroot ${BUILD_PREFIX}
 
 USER noroot
 

+ 2 - 1
docker/Dockerfile.latest

@@ -25,9 +25,10 @@ WORKDIR ${BUILD_PREFIX}
 ADD docker/entrypoint.sh /entrypoint.sh
 
 RUN chmod +x /entrypoint.sh \
+    && mkdir -p /home/noroot \
     && groupadd -r noroot \
     && useradd -r -g noroot -s /bin/bash -d /home/noroot noroot \
-    && chown -R noroot:noroot ${BUILD_PREFIX}
+    && chown -R noroot:noroot /home/noroot ${BUILD_PREFIX}
 
 USER noroot
 

+ 1 - 1
plugins/plugin_manager.py

@@ -123,7 +123,7 @@ class PluginManager:
                     try:
                         instance = plugincls()
                     except Exception as e:
-                        logger.error("Failed to init %s, diabled. %s" % (name, e))
+                        logger.exception("Failed to init %s, diabled. %s" % (name, e))
                         self.disable_plugin(name)
                         failed_plugins.append(name)
                         continue