Merge pull request #32 from ayapapa/3.4.7

3.4.7

ALM_VERSION

@@ -1 +1 @@
-v3.4.6
+v3.4.7.1

Dockerfile

@@ -21,8 +21,8 @@ ENV ALM_HOME="/home/alm"  \
     ALM_BACKUP_DIR="/var/opt/alminium-backup" \
     ALM_BACKUP_LOG="/opt/alminium/log/backup.log" \
     ALM_DB_SETUP="N" \
-    ALM_VER="v3.4.6" \
-    RM_VER="3.4.6" \
+    ALM_VER="v3.4.7.1" \
+    RM_VER="3.4.7" \
     DEBIAN_FRONTEND="noninteractive"
 
 # copy install script

README.md

@@ -61,6 +61,8 @@ After that, set "Jenkins management" → "Global security setting" → "Enable s
 * DB passwoerd: alminium
 * Redmine version: 1.2.0以上
 
+If you need Jenkins configuration file, you can find /home/jenkins on the host PC.
+
 (Japanese)インストール後、最初にJenkinsサービスにアクセスすると、初期化処理が開始されます。初期パスワードは、 ```/home/jenkins/secrets/initialAdminPassword``` を利用してください。
 また、ALMinium(Redmine)と認証連携をする場合は、初期化時あるいは初期化後に、**Redmine plugin**を有効化してください。
 その後、「Jenkinsの管理」→「グローバルセキュリティの設定」→「セキュリティを有効化」→「Redmineユーザー認証を選択」し、以下の通り設定してください。
@@ -73,6 +75,9 @@ After that, set "Jenkins management" → "Global security setting" → "Enable s
 * DBパスワード	: alminium
 * Redmineバージョン: 1.2.0以上
 
+※Jenkins設定ファイルは、/home/jenkinsに格納されています。
+
+
 ## To use behind a proxy 
 To use behind a proxy, please add environment variables, **http_proxy** and **https_proxy**, into docker-compose.yml.
 

RM_VERSION

@@ -1 +1 @@
-3.4.6
+3.4.7

docker-compose.yml

@@ -23,7 +23,7 @@ services:
 
   ALMinium:
     restart: always
-    image: ayapapa/docker-alminium:3.4.6
+    image: ayapapa/docker-alminium:3.4.7.1
     ports:
       - "10080:80"
       - "10443:443"

install.sh

@@ -42,7 +42,7 @@ sed -i "/^#JENKINS#/d" \
 cd ${ALM_HOME}
 ln -s ./alminium/backup .
 ln -s ./alminium/restore .
-ln -s ./alminium/inst-scripts .
+ln -s ./alminium/inst-script .
 
 # delete resouces
 apt-get -y purge bc libmagickcore-dev libmagickwand-dev \

update.sh

@@ -35,6 +35,7 @@ if [ ! -f ${ALM_HOME}/initialized ]; then
   echo "successed to connect db."
 
   # gem install for redmine_jenkins and db migration
+  BUNDLER=bundle
   source ${ALM_SRC_DIR}/redmine/setup/setup-db
   pushd ${ALM_INSTALL_DIR}
   mv plugins-jenkins/* plugins/  2>/dev/null
@@ -46,20 +47,23 @@ if [ ! -f ${ALM_HOME}/initialized ]; then
   touch ${ALM_HOME}/initialized
 fi
 mysql -e "GRANT ALL PRIVILEGES ON alminium.* TO 'alminium'@'%' IDENTIFIED BY 'alminium'" mysql 2>/dev/null
+echo "db service is ready."
 
 #
 # attachement files
 #
 if [ ! -f /opt/alminium/files/initialized ]; then
   cd /opt/alminium && tar xzf ${ALM_HOME}/files.tar.gz
 fi
+echo "attachement files are ready."
 
 #
 # ALMinium's repo
 #
 if [ ! -f /var/opt/alminium/initialized ]; then
   cd /var/opt && tar xzf ${ALM_HOME}/repo.tar.gz
 fi
+echo "repositories are ready."
 
 # HOSTNAME
 ALM_OLD_HOSTNAME=`cat /etc/opt/alminium/hostname`
@@ -73,6 +77,8 @@ if [ "${ALM_OLD_HOSTNAME}" != "${ALM_HOSTNAME}" ]; then
   done
   echo ${ALM_HOSTNAME} > /etc/opt/alminium/hostname
 fi
+echo "HOSTNAME settings are ready."
+echo "HOSTNAME is ${ALM_HOSTNAME} (old name is ${ALM_OLD_HOSTNAME})"
 
 #
 # RELATIVE_PATH
@@ -118,7 +124,6 @@ then
     REPLACE_TO="RailsBaseURI ${NEW_PATH}"
     mv /var/www/html/${ALM_OLD_REL_PATH} /var/www/html/${ALM_NEW_REL_PATH}
   fi
-
   # modify apache configuration
   cd /etc/opt/alminium
   for FILE in $(ls redmine*.conf vcs.conf)
@@ -136,6 +141,8 @@ then
   # modify current relative path
   echo ${ALM_NEW_REL_PATH} > /etc/opt/alminium/relative_path
 fi
+echo "rerative settings are ready."
+echo "rerative path is ${ALM_NEW_REL_PATH} (old name is ${ALM_OLD_REL_PATH})"
 
 #
 # email