diff --git a/Dockerfile b/Dockerfile index 12f52a1..2bc6fbb 100644 --- a/Dockerfile +++ b/Dockerfile @@ -28,9 +28,7 @@ COPY \ # copy repositories /etc/apk/repositories # -------------------------------------- -USER root RUN /root/setup.sh -USER ${dockeruser} # nodejs npm install --- opencv----- uncomment -------------------------- @@ -63,8 +61,9 @@ COPY ${NODEPROJECTSRC2} /home/${USER1}/${NODEPROJECT2} RUN chown -R ${USER1}.${USER1} /home/${USER1} +RUN /home/${USER1}/${NODEPROJECT}/install-fluent.sh USER root -RUN /home/${USER1}/${NODEPROJECT}/install-fluent.sh +RUN /home/${USER1}/${NODEPROJECT}/install-fluent-root.sh USER ${USER1} diff --git a/setup.sh b/setup.sh index bca0434..3f90edc 100755 --- a/setup.sh +++ b/setup.sh @@ -74,20 +74,9 @@ chown -R node.node /home/docker/.gem chown -R node.node /fluentd/etc chown -R node.node /fluentd/plugins -echo "==> Install gem" - -gem install fluentd --no-doc -gem install fluent-plugin-mongo -gem install oj -gem install json -gem install async-http -gem install ext-monitor - -gem sources --clear-all \ echo "==> Clean up" rm -rf \ /root/.gnupg \ /setup.sh \ - /extrapackages \ - /tmp/* /var/tmp/* /usr/lib/ruby/gems/*/cache/*.gem + /extrapackages