Page Menu
Home
DevCentral
Search
Configure Global Search
Log In
Files
F32064685
No One
Temporary
Actions
View File
Edit File
Delete File
View Transforms
Subscribe
Mute Notifications
Award Token
Flag For Later
Size
3 KB
Referenced Files
None
Subscribers
None
View Options
diff --git a/Changelog.md b/Changelog.md
deleted file mode 100644
index 6ee4a0e..0000000
--- a/Changelog.md
+++ /dev/null
@@ -1,69 +0,0 @@
-# Changelog
-
-**4.4.0**
-- openfire: upgrade to 4.4.0
-
-**4.3.2**
-- openfire: upgrade to 4.3.2
-
-**4.2.3**
-- openfire: upgrade to 4.2.3
-
-**4.2.2**
-- openfire: upgrade to 4.2.2
-- java: upgrade to 8u161
-
-**4.2.1**
-- openfire: upgrade to 4.2.1
-
-**4.1.6**
-- openfire: upgrade to 4.1.6
-- java: upgrade to 8u151
-
-**4.1.5-1**
-- java: upgrade to 8u144
-
-**4.1.5**
-- openfire: upgrade to 4.1.5
-
-**4.1.4**
-- openfire: upgrade to 4.1.4
-- java: upgrade to 8u131
-
-**4.1.3**
-- openfire: upgrade to 4.1.3
-
-**4.1.2**
-- openfire: upgrade to 4.1.2
-
-**4.1.1**
-- openfire: upgrade to 4.1.1
-- java: use Oracle Java 8
-- Publish more useful ports
-
-**3.10.3**
-- openfire: upgrade to 3.10.3
-
-**3.10.2-1**
-- persistent data volume moved to `/var/lib/openfire`
-
-**3.10.2**
-- openfire: upgrade to 3.10.2
-
-**3.10.0**
-- More directory structure reorganization
-- openfire: upgrade to 3.10.0
-
-**3.9.3-4**
-- Redefined directory structure in data volume
-- Create `VERSION` file in data volume
-
-**3.9.3-3**
-- base image update to fix SSL vulnerability
-
-**3.9.3-2**
-- upgrade to sameersbn/debian:jessie.20141001, plugs shellshock
-
-**3.9.3-1**
-- update to the sameersbn/ubuntu:14.04.20140818 baseimage
-- initial version 3.9.3
diff --git a/utils/upgrade-version b/utils/upgrade-version
index 7aa31d2..d3604fc 100755
--- a/utils/upgrade-version
+++ b/utils/upgrade-version
@@ -1,80 +1,83 @@
#!/bin/sh
# -------------------------------------------------------------
# Prepare an upgrade change and send it to review
# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
# Project: Nasqueron
# Author: Sébastien Santoro aka Dereckson
# License: BSD-2-Clause
# -------------------------------------------------------------
# Docker host for container
SERVER=equatower
# -------------------------------------------------------------
# Parse arguments
#
# Usage: upgrade-version <new version>
# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
if [ $# -ne 1 ]; then
echo "Usage: $0 <new version>"
exit 1
fi
if [ ! -f VERSION ]; then
echo This script must be run at the repository root. A VERSION file is expected.
exit 2
fi
OLD_VERSION=$(cat VERSION)
NEW_VERSION=$1
# -------------------------------------------------------------
# Determine available toolchain
#
# :: GNU sed path
# :: Arcanist is installed?
# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
if hash gsed 2> /dev/null; then
SED="gsed"
else
SED="sed"
fi
hash arc 2> /dev/null
WITH_ARCANIST=$?
# -------------------------------------------------------------
# Update files
# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
echo "$NEW_VERSION" > VERSION
-$SED -i "s/$OLD_VERSION/$NEW_VERSION/g" Dockerfile
+
+for f in Dockerfile README.md docker-compose.yml; do
+ $SED -i "s/$OLD_VERSION/$NEW_VERSION/g" $f
+done
# -------------------------------------------------------------
# Prepare change for review
# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
git checkout -b "upgrade/$NEW_VERSION"
-git commit VERSION Dockerfile \
+git commit VERSION Dockerfile README.md docker-compose.yml \
-m "Upgrade to Openfire $NEW_VERSION" -m "" \
-m "Reference: http://download.igniterealtime.org/openfire/docs/latest/changelog.html"
if [ $WITH_ARCANIST ]; then
arc diff "HEAD^"
else
git show
fi
echo "Next steps:"
echo " - Accept the revision"
echo ' - Merge it to master with `arc land`'
echo " - Tag commit with \`git tag $NEW_VERSION\`"
echo ' - Publish tag with `git push --tags`'
echo "To deploy:"
echo " - ssh $SERVER sudo docker pull nasqueron/openfire"
echo " - cd <ops repo>"
echo " - salt $SERVER state.sls roles/paas-docker/containers/openfire"
File Metadata
Details
Attached
Mime Type
text/x-diff
Expires
Mon, Jun 8, 09:07 (1 d, 11 h)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
3785056
Default Alt Text
(3 KB)
Attached To
Mode
rDO Docker image for Openfire
Attached
Detach File
Event Timeline
Log In to Comment