From b098751bbf9f71d8d164954720deaf083f6f465e Mon Sep 17 00:00:00 2001 From: Eelco Cramer Date: Wed, 23 Mar 2016 11:21:01 +0100 Subject: [PATCH 1/3] Updates to openfire 4.0.1 --- Dockerfile | 8 ++++++-- README.md | 8 ++++---- VERSION | 2 +- docker-compose.yml | 2 +- 4 files changed, 12 insertions(+), 8 deletions(-) diff --git a/Dockerfile b/Dockerfile index 4d19b6a..f2f043b 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,13 +1,17 @@ FROM sameersbn/ubuntu:14.04.20160317 MAINTAINER sameer@damagehead.com -ENV OPENFIRE_VERSION=3.10.3 \ +ENV OPENFIRE_VERSION=4.0.1 \ OPENFIRE_USER=openfire \ OPENFIRE_DATA_DIR=/var/lib/openfire \ OPENFIRE_LOG_DIR=/var/log/openfire RUN apt-get update \ - && DEBIAN_FRONTEND=noninteractive apt-get install -y openjdk-7-jre \ + && apt-get install -y software-properties-common python-software-properties \ + && add-apt-repository ppa:openjdk-r/ppa \ + && apt-get update \ + && apt-get install -y openjdk-8-jre openjdk-7-jre \ + && update-java-alternatives --jre-headless -s java-1.8.0-openjdk-amd64 \ && wget "http://download.igniterealtime.org/openfire/openfire_${OPENFIRE_VERSION}_all.deb" -O /tmp/openfire_${OPENFIRE_VERSION}_all.deb \ && dpkg -i /tmp/openfire_${OPENFIRE_VERSION}_all.deb \ && mv /var/lib/openfire/plugins/admin /usr/share/openfire/plugin-admin \ diff --git a/README.md b/README.md index 6a0f7b7..9e8bb96 100644 --- a/README.md +++ b/README.md @@ -48,7 +48,7 @@ Automated builds of the image are available on [Dockerhub](https://hub.docker.co > **Note**: Builds are also available on [Quay.io](https://quay.io/repository/sameersbn/openfire) ```bash -docker pull sameersbn/openfire:3.10.3-6 +docker pull sameersbn/openfire:4.0.1-1 ``` Alternatively you can build the image yourself. @@ -65,7 +65,7 @@ Start Openfire using: docker run --name openfire -d --restart=always \ --publish 9090:9090 --publish 5222:5222 --publish 7777:7777 \ --volume /srv/docker/openfire:/var/lib/openfire \ - sameersbn/openfire:3.10.3-6 + sameersbn/openfire:4.0.1-1 ``` *Alternatively, you can use the sample [docker-compose.yml](docker-compose.yml) file to start the container using [Docker Compose](https://docs.docker.com/compose/)* @@ -102,7 +102,7 @@ To upgrade to newer releases: 1. Download the updated Docker image: ```bash - docker pull sameersbn/openfire:3.10.3-6 + docker pull sameersbn/openfire:4.0.1-1 ``` 2. Stop the currently running image: @@ -122,7 +122,7 @@ To upgrade to newer releases: ```bash docker run -name openfire -d \ [OPTIONS] \ - sameersbn/openfire:3.10.3-6 + sameersbn/openfire:4.0.1-1 ``` ## Shell Access diff --git a/VERSION b/VERSION index 33a3b22..99f3323 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -3.10.3-6 +4.0.1-1 diff --git a/docker-compose.yml b/docker-compose.yml index fe66f9c..9f8e8f8 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -1,5 +1,5 @@ Openfire: - image: sameersbn/openfire:3.10.3-6 + image: sameersbn/openfire:4.0.1-1 ports: - "9090:9090" - "5222:5222" From b99272e0d8cb4255e0fbd6b7b807f2e19af87fdb Mon Sep 17 00:00:00 2001 From: Eelco Cramer Date: Tue, 29 Mar 2016 12:57:12 +0200 Subject: [PATCH 2/3] Updates openfire to version 4.0.2 --- Dockerfile | 2 +- README.md | 10 +++++----- VERSION | 2 +- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/Dockerfile b/Dockerfile index 6b4672c..2a94b9f 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,7 +1,7 @@ FROM sameersbn/ubuntu:14.04.20160321 MAINTAINER sameer@damagehead.com -ENV OPENFIRE_VERSION=4.0.1 \ +ENV OPENFIRE_VERSION=4.0.2 \ OPENFIRE_USER=openfire \ OPENFIRE_DATA_DIR=/var/lib/openfire \ OPENFIRE_LOG_DIR=/var/log/openfire diff --git a/README.md b/README.md index ad3c298..21930eb 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ [![Docker Repository on Quay.io](https://quay.io/repository/sameersbn/openfire/status "Docker Repository on Quay.io")](https://quay.io/repository/sameersbn/openfire) -# sameersbn/openfire:3.10.3-7 +# sameersbn/openfire:4.0.2-1 - [Introduction](#introduction) - [Contributing](#contributing) @@ -48,7 +48,7 @@ Automated builds of the image are available on [Dockerhub](https://hub.docker.co > **Note**: Builds are also available on [Quay.io](https://quay.io/repository/sameersbn/openfire) ```bash -docker pull sameersbn/openfire:4.0.1-1 +docker pull sameersbn/openfire:4.0.2-1 ``` Alternatively you can build the image yourself. @@ -65,7 +65,7 @@ Start Openfire using: docker run --name openfire -d --restart=always \ --publish 9090:9090 --publish 5222:5222 --publish 7777:7777 \ --volume /srv/docker/openfire:/var/lib/openfire \ - sameersbn/openfire:4.0.1-1 + sameersbn/openfire:4.0.2-1 ``` *Alternatively, you can use the sample [docker-compose.yml](docker-compose.yml) file to start the container using [Docker Compose](https://docs.docker.com/compose/)* @@ -102,7 +102,7 @@ To upgrade to newer releases: 1. Download the updated Docker image: ```bash - docker pull sameersbn/openfire:4.0.1-1 + docker pull sameersbn/openfire:4.0.2-1 ``` 2. Stop the currently running image: @@ -122,7 +122,7 @@ To upgrade to newer releases: ```bash docker run -name openfire -d \ [OPTIONS] \ - sameersbn/openfire:4.0.1-1 + sameersbn/openfire:4.0.2-1 ``` ## Shell Access diff --git a/VERSION b/VERSION index 99f3323..2e18714 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -4.0.1-1 +4.0.2-1 From 7343c10ae9248df575fe483f8890dc89f3dc37a6 Mon Sep 17 00:00:00 2001 From: Eelco Cramer Date: Tue, 29 Mar 2016 13:05:54 +0200 Subject: [PATCH 3/3] Updates version in compose --- docker-compose.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker-compose.yml b/docker-compose.yml index 9f8e8f8..9b8e4c0 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -1,5 +1,5 @@ Openfire: - image: sameersbn/openfire:4.0.1-1 + image: sameersbn/openfire:4.0.2-1 ports: - "9090:9090" - "5222:5222"