Skip to content

Commit

Permalink
Merge pull request #12 from rutebanken/master
Browse files Browse the repository at this point in the history
Update ActiveMQ version 5.12.0 to 5.13.0
  • Loading branch information
disaster37 committed Feb 4, 2016
2 parents 36c55ea + cb4c614 commit 39eb8ef
Show file tree
Hide file tree
Showing 6 changed files with 10 additions and 10 deletions.
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#ActiveMQ 5.12.0
#ActiveMQ 5.13.0

FROM webcenter/openjdk-jre:8
MAINTAINER Sebastien LANGOUREAUX <[email protected]>
Expand Down
10 changes: 5 additions & 5 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ Dockerfile to build a ActiveMQ container image.

## Version

Current Version: **5.12.0**
Current Version: **5.13.0**

# Hardware Requirements

Expand Down Expand Up @@ -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.12.0
docker pull webcenter/activemq:5.13.0
```

You can also pull the `latest` tag which is built from the repository *HEAD*
Expand Down Expand Up @@ -134,10 +134,10 @@ docker run --name='activemq' -d \
-e 'ACTIVEMQ_NAME=amqp-srv1' \
-e 'ACTIVEMQ_REMOVE_DEFAULT_ACCOUNT=true' \
-e 'ACTIVEMQ_ADMIN_LOGIN=admin' -e 'ACTIVEMQ_ADMIN_PASSWORD=your_password' \
-e 'ACTIVEMQ_WRITE_LOGIN=producer_login' -e 'ACTIVEMQ_WRITE_PASSWORD=producer_password'
-e 'ACTIVEMQ_WRITE_LOGIN=producer_login' -e 'ACTIVEMQ_WRITE_PASSWORD=producer_password' \
-e 'ACTIVEMQ_READ_LOGIN=consumer_login' -e 'ACTIVEMQ_READ_PASSWORD=consumer_password' \
-e 'ACTIVEMQ_JMX_LOGIN=jmx_login' -e 'ACTIVEMQ_JMX_PASSWORD=jmx_password' \
-e 'ACTIVEMQ_STATIC_TOPICS=topic1;topic2;topic3'
-e 'ACTIVEMQ_STATIC_TOPICS=topic1;topic2;topic3' \
-e 'ACTIVEMQ_STATIC_QUEUES=queue1;queue2;queue3' \
-e 'ACTIVEMQ_MIN_MEMORY=1024' -e 'ACTIVEMQ_MAX_MEMORY=4096' \
-e 'ACTIVEMQ_ENABLED_SCHEDULER=true' \
Expand All @@ -146,7 +146,7 @@ docker run --name='activemq' -d \
-p 8161:8161 \
-p 61616:61616 \
-p 61613:61613 \
webcenter/activemq:5.12.0
webcenter/activemq:5.13.0
```


Expand Down
2 changes: 1 addition & 1 deletion VERSION
Original file line number Diff line number Diff line change
@@ -1 +1 @@
5.12.0
5.13.0
Empty file removed assets/setup/.install.swp
Empty file.
4 changes: 2 additions & 2 deletions assets/setup/install
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
set -e


ACTIVEMQ_VERSION="5.12.0"
ACTIVEMQ_VERSION="5.13.0"
ACTIVEMQ_HOME="/opt/activemq"
SETUP_DIR="/app/setup"
LOG_DIR="/var/log"
Expand All @@ -11,7 +11,7 @@ DATA_DIR="/data"
# Start install
mkdir -p ${ACTIVEMQ_HOME}
cd /usr/src
curl -LO http://mir2.ovh.net/ftp.apache.org/dist/activemq/${ACTIVEMQ_VERSION}/apache-activemq-${ACTIVEMQ_VERSION}-bin.tar.gz
curl -LO http://apache.uib.no/activemq/${ACTIVEMQ_VERSION}/apache-activemq-${ACTIVEMQ_VERSION}-bin.tar.gz
tar -xvzf apache-activemq-${ACTIVEMQ_VERSION}-bin.tar.gz
mv apache-activemq-${ACTIVEMQ_VERSION}/* ${ACTIVEMQ_HOME}
rm -rf /usr/src/*
Expand Down
2 changes: 1 addition & 1 deletion fig.yml
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
activemq:
image: webcenter/activemq:5.12.0
image: webcenter/activemq:5.13.0

0 comments on commit 39eb8ef

Please sign in to comment.