Merge branch 'jbdelpech-run-image-as-unpriviledge-user' into develop

Author: martijnrondeel

Dockerfile

@@ -45,5 +45,12 @@ COPY config/config.json config/config.json
 COPY rule_templates/ /opt/elastalert/rule_templates
 COPY elastalert_modules/ /opt/elastalert/elastalert_modules
 
+# Add default rules directory
+# Set permission as unpriviledged user (1000:1000), compatible with Kubernetes
+RUN mkdir -p /opt/elastalert/rules/ /opt/elastalert/server_data/tests/ \
+    && chown -R node:node /opt
+
+USER node
+
 EXPOSE 3030
 ENTRYPOINT ["npm", "start"]

LICENSE.md

@@ -1,7 +1,7 @@
 The 3-clause BSD license (Modified)
 ===================================
 
-Copyright © 2018, BitSensor B.V.
+Copyright © 2019, BitSensor B.V.
 
 Redistribution and use in source and binary forms, with or without
 modification, are permitted provided that the following conditions are met:
@@ -14,9 +14,9 @@ modification, are permitted provided that the following conditions are met:
   * Neither the name of BitSensor, BitSensor B.V. nor the
     names of its contributors may be used to endorse or promote products
     derived from this software without specific prior written permission.
-    However, those names can be used when explicitely stating the use of
-    the ElastAlert Server Plugin (which can be rephrased as the Alerting
-    Plugin).
+    However, those names can be used when explicitly stating the use of
+    the 'ElastAlert Server Plugin' (which can be rephrased as the 'Alerting
+    Plugin').
 
 THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS "AS IS" AND ANY
 EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED