Skip to content

Commit

Permalink
Merge branch 'jbdelpech-run-image-as-unpriviledge-user' into develop
Browse files Browse the repository at this point in the history
  • Loading branch information
martijnrondeel committed May 14, 2019
2 parents 6720985 + ed51c2c commit c689475
Show file tree
Hide file tree
Showing 2 changed files with 11 additions and 4 deletions.
7 changes: 7 additions & 0 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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"]
8 changes: 4 additions & 4 deletions LICENSE.md
Original file line number Diff line number Diff line change
@@ -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:
Expand All @@ -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
Expand Down

0 comments on commit c689475

Please sign in to comment.