Merge branch 'release/4.5.2-0alvistack3'

CHANGELOG.md

@@ -1,6 +1,11 @@
 Docker Image Packaging for Atlassian Fisheye
 ============================================
 
+4.5.2-0alvistack3 - 2018-03-11
+------------------------------
+
+-   Simplify Docker image naming
+
 4.5.2-0alvistack1 - 2018-02-28
 ------------------------------
 

Dockerfile

@@ -19,13 +19,7 @@ ENV FISHEYE_GROUP                "daemon"
 ENV FISHEYE_HOME                 "/var/atlassian/application-data/fisheye"
 ENV FISHEYE_CATALINA             "/opt/atlassian/fisheye"
 ENV FISHEYE_DOWNLOAD_URL         "https://downloads.atlassian.com/software/fisheye/downloads/fisheye-4.5.2.zip"
-
 ENV JAVA_HOME                    "/usr/java/default"
-ENV JAVA_DOWNLOAD_URL            "http://download.oracle.com/otn-pub/java/jdk/8u162-b12/0da788060d494f5095bf8624735fa2f1/jre-8u162-linux-x64.rpm"
-
-ENV DUMB_INIT_BIN_DIR            "/usr/local/bin"
-ENV DUMB_INIT_DOWNLOAD_URL       "https://github.com/Yelp/dumb-init/releases/download/v1.2.1/dumb-init_1.2.1_amd64"
-
 ENV JVM_MINIMUM_MEMORY           "512m"
 ENV JVM_MAXIMUM_MEMORY           "1024m"
 ENV CATALINA_CONNECTOR_PROXYNAME ""
@@ -35,28 +29,27 @@ ENV CATALINA_CONNECTOR_SECURE    "false"
 ENV CATALINA_CONTEXT_PATH        ""
 ENV JVM_SUPPORT_RECOMMENDED_ARGS "-Datlassian.plugins.enable.wait=300"
 
-VOLUME $FISHEYE_HOME
+VOLUME  $FISHEYE_HOME
 WORKDIR $FISHEYE_HOME
 
-EXPOSE 8060 8059
+EXPOSE 8059
+EXPOSE 8060
 
 ENTRYPOINT [ "/usr/local/bin/dumb-init", "--" ]
-CMD [ "/etc/init.d/fisheye", "start", "-fg" ]
+CMD        [ "/etc/init.d/fisheye", "start", "-fg" ]
 
 # Prepare APT depedencies
 RUN set -ex \
     && apt-get update \
-    && DEBIAN_FRONTEND=noninteractiev apt-get install -y alien apt-transport-https apt-utils aptitude bzip2 ca-certificates curl debian-archive-keyring debian-keyring git htop psmisc python-apt rsync sudo unzip vim wget zip \
-    && apt-get -y autoremove \
-    && apt-get -y autoclean \
+    && DEBIAN_FRONTEND=noninteractive apt-get install -y alien apt-transport-https apt-utils aptitude bzip2 ca-certificates curl debian-archive-keyring debian-keyring git htop psmisc python-apt rsync sudo unzip vim wget zip \
     && rm -rf /var/lib/apt/lists/*
 
 # Install Oracle JRE
 RUN set -ex \
     && ln -s /usr/bin/update-alternatives /usr/sbin/alternatives \
     && ARCHIVE="`mktemp --suffix=.rpm`" \
-    && curl -skL -j -H "Cookie: oraclelicense=accept-securebackup-cookie" $JAVA_DOWNLOAD_URL > $ARCHIVE \
-    && alien -i -k --scripts $ARCHIVE \
+    && curl -skL -j -H "Cookie: oraclelicense=accept-securebackup-cookie" http://download.oracle.com/otn-pub/java/jdk/8u162-b12/0da788060d494f5095bf8624735fa2f1/jre-8u162-linux-x64.rpm > $ARCHIVE \
+    && DEBIAN_FRONTEND=noninteractive alien -i -k --scripts $ARCHIVE \
     && rm -rf $ARCHIVE
 
 # Install Atlassian Fisheye
@@ -70,13 +63,17 @@ RUN set -ex \
 
 # Install dumb-init
 RUN set -ex \
-    && curl -skL $DUMB_INIT_DOWNLOAD_URL > $DUMB_INIT_BIN_DIR/dumb-init \
-    && chmod 0755 $DUMB_INIT_BIN_DIR/dumb-init
+    && curl -skL https://github.com/Yelp/dumb-init/releases/download/v1.2.1/dumb-init_1.2.1_amd64 > /usr/local/bin/dumb-init \
+    && chmod 0755 /usr/local/bin/dumb-init
 
 # Copy files
 COPY files /
 
 # Ensure required folders exist with correct owner:group
 RUN set -ex \
-    && mkdir -p $FISHEYE_HOME $FISHEYE_CATALINA \
-    && chown -Rf $FISHEYE_OWNER:$FISHEYE_GROUP $FISHEYE_HOME $FISHEYE_CATALINA
+    && mkdir -p $FISHEYE_HOME \
+    && chown -Rf $FISHEYE_OWNER:$FISHEYE_GROUP $FISHEYE_HOME \
+    && chmod 0755 $FISHEYE_HOME \
+    && mkdir -p $FISHEYE_CATALINA \
+    && chown -Rf $FISHEYE_OWNER:$FISHEYE_GROUP $FISHEYE_CATALINA \
+    && chmod 0755 $FISHEYE_CATALINA