Merge branch 'release/5.13.2'

Changelog.md

@@ -1,5 +1,9 @@
 # Changelog
 
+**v3.0.2
+  - Upgrade to ActiveMQ 5.13.2
+  - Add parameter to disable auth
+
 **v3.0.0
   - Upgrade to Ubuntu 15.10 and on last OpenJDK-jre
   - Upgrade to Activemq 5.12.0

Dockerfile

@@ -1,13 +1,11 @@
-#ActiveMQ 5.13.1
-
 FROM webcenter/openjdk-jre:8
 MAINTAINER Sebastien LANGOUREAUX <[email protected]>
 
 
 # Update distro and install some packages
 RUN apt-get update && \
     apt-get upgrade -y && \
-    apt-get install curl -y && \
+    apt-get install vim curl -y && \
     apt-get install supervisor -y && \
     apt-get install logrotate -y && \
     apt-get install locales -y && \
@@ -16,31 +14,33 @@ RUN apt-get update && \
     dpkg-reconfigure locales && \
     rm -rf /var/lib/apt/lists/*
 
-# Copy the app setting
-COPY assets/init.py /app/init.py
-RUN chmod 755 /app/init.py
-
 
 # Lauch app install
 COPY assets/setup/ /app/setup/
-RUN chmod 755 /app/setup/install
+RUN chmod +x /app/setup/install
 RUN /app/setup/install
 
+
+# Copy the app setting
+COPY assets/init.py /app/init.py
+COPY assets/run.sh /app/run.sh
+RUN chmod +x /app/init.py
+RUN chmod +x /app/run.sh
+
 # Expose all port
-EXPOSE 8161 
-EXPOSE 61616 
+EXPOSE 8161
+EXPOSE 61616
 EXPOSE 5672
 EXPOSE 61613
-EXPOSE 1883 
+EXPOSE 1883
 EXPOSE 61614
 
 # Expose some folders
 VOLUME ["/data/activemq"]
 VOLUME ["/var/log/activemq"]
 VOLUME ["/opt/activemq/conf"]
 
-#WORKDIR /opt/activemq
+WORKDIR /opt/activemq
 
 #ENTRYPOINT ["/app/init"]
-CMD ["/app/init.py", "start"]
-
+CMD ["/app/run.sh"]

README.md

@@ -28,7 +28,7 @@ Dockerfile to build a ActiveMQ container image.
 
 ## Version
 
-Current Version: **5.13.1**
+Current Version: **5.13.2**
 
 # Hardware Requirements
 
@@ -98,7 +98,7 @@ In your issue report please make sure you provide the following information:
 Pull the image from the docker index. This is the recommended method of installation as it is easier to update image. These builds are performed by the **Docker Trusted Build** service.
 
 ```bash
-docker pull webcenter/activemq:5.13.1
+docker pull webcenter/activemq:5.13.2
 ```
 
 You can also pull the `latest` tag which is built from the repository *HEAD*
@@ -146,7 +146,7 @@ docker run --name='activemq' -d \
 -p 8161:8161 \
 -p 61616:61616 \
 -p 61613:61613 \
-webcenter/activemq:5.13.1
+webcenter/activemq:5.13.2
 ```
 
 
@@ -194,12 +194,13 @@ Below is the complete list of available options that can be used to customize yo
 - **ACTIVEMQ_TEMP_USAGE**: The maximum amount of space temp the broker will use before disabling caching and/or slowing down producers. Default to `50 gb`
 - **ACTIVEMQ_MAX_CONNECTION**: It's DOS protection. It limit concurrent connections. Default to `1000`
 - **ACTIVEMQ_FRAME_SIZE**: It's DOS protection. It limit the frame size. Default to `104857600` (100MB)
-- **ACTIVEMQ_ENABLED_SCHEDULER**: Permit to enabled scheduler in ActiveMQ
+- **ACTIVEMQ_ENABLED_SCHEDULER**: Permit to enabled scheduler in ActiveMQ. Dault to `true`
+- **ACTIVEMQ_ENABLED_AUTH**: Permit to enabled the authentification in queue and topic (no anonymous access). Default to `true`
 - **ACTIVEMQ_MIN_MEMORY**: The init memory in MB that ActiveMQ take when start (it's like XMS). Default to `128` (128 MB)
 - **ACTIVEMQ_MAX_MEMORY**: The max memory in MB that ActiveMQ can take (it's like XMX). Default to `1024` (1024 MB)
 
 - **ACTIVEMQ_REMOVE_DEFAULT_ACCOUNT**: It's permit to remove all default login on ActiveMQ (Webconsole, broker and JMX). Default to `false`
-- **ACTIVEMQ_ADMIN_LOGIN**: The login for admin account (broker and web console). Default to `admin` 
+- **ACTIVEMQ_ADMIN_LOGIN**: The login for admin account (broker and web console). Default to `admin`
 - **ACTIVEMQ_ADMIN_PASSWORD**: The password for admin account. Default to `admin`
 - **ACTIVEMQ_USER_LOGIN**: The login to access on web console with user role (no right on broker). Default to `user`
 - **ACTIVEMQ_USER_PASSWORD**: The password for user account. Default to `user`
@@ -222,6 +223,3 @@ For advance configuration, the best way is to read ActiveMQ documentation and cr
 Next, you can mount it when you run this image or you can create your own image (base on this image) and include your specifics config file.
 
 The home of ActiveMQ is in /opt/activemq, so if you want to override all the setting, you can launch docker with ` -v /your_path/conf:/opt/activemq/conf`
-
-
-

VERSION

@@ -1 +1 @@
-5.13.1
+5.13.2