Merge pull request 'Fix plugins adding issue' (#2) from pasindu/entgra-emqx-docker:minorFix into master

Reviewed-on: community/entgra-emqx-docker#2
master
Amalka Subasinghe 5 months ago
commit 1cbbc962fb

@ -18,17 +18,17 @@ FROM emqx/emqx:4.4.11
ARG STATIC_CONFIG_PATH=/opt/emqx/lib/emqx_dashboard-4.4.10/priv/www/static/ ARG STATIC_CONFIG_PATH=/opt/emqx/lib/emqx_dashboard-4.4.10/priv/www/static/
USER root
# Copy static files # Copy static files
COPY /static/css/* ${STATIC_CONFIG_PATH}/css/ COPY /static/css/* ${STATIC_CONFIG_PATH}/css/
COPY /static/img/* ${STATIC_CONFIG_PATH}/img/ COPY /static/img/* ${STATIC_CONFIG_PATH}/img/
# Copy configuration and data files # Copy configuration and data files
COPY /configs/emqx_exhook.conf /opt/emqx/etc/plugins/ COPY /configs/emqx_exhook.conf /opt/emqx/etc/plugins/
COPY /data/loaded_plugins /opt/emqx/data/ COPY /data/loaded_plugins /opt/data/
EXPOSE 1883 8083 8084 8883 11883 18083 4370 5369 EXPOSE 1883 8083 8084 8883 11883 18083 4370 5369
COPY ./entrypoint.sh /opt/emqx/bin/entrypoint.sh COPY ./entrypoint.sh /opt/emqx/bin/entrypoint.sh
USER root
RUN chmod +x /opt/emqx/bin/entrypoint.sh RUN chmod +x /opt/emqx/bin/entrypoint.sh
ENTRYPOINT ["/opt/emqx/bin/entrypoint.sh"] ENTRYPOINT ["/opt/emqx/bin/entrypoint.sh"]

@ -21,5 +21,9 @@ CONFIG_PATH=/opt/emqx/etc/plugins/emqx_exhook.conf
# Set emqx_exhook.conf configs # Set emqx_exhook.conf configs
sed -i 's/${SERVER_HOSTNAME}/'$SERVER_HOSTNAME'/g' $CONFIG_PATH sed -i 's/${SERVER_HOSTNAME}/'$SERVER_HOSTNAME'/g' $CONFIG_PATH
# Add plugins
rm -f /opt/emqx/data/loaded_plugins
mv /opt/data/loaded_plugins /opt/emqx/data/loaded_plugins
echo "Starting server.." echo "Starting server.."
sh /opt/emqx/bin/emqx foreground sh /opt/emqx/bin/emqx foreground

Loading…
Cancel
Save