Merge pull request #85 from msmshariq/build-fix

Fix errors in Dockerfile

dockerfiles/apim-analytics/Dockerfile

@@ -29,12 +29,12 @@ ARG USER_HOME=/home/${USER}
 # set dependant files directory
 ARG FILES=./files
 # set jdk configurations
-ARG JDK_DIST=jdk1.8.0_144
-ARG JAVA_HOME=${USER_HOME}/${JDK_DIST}
+ARG JDK=jdk1.8.0*
+ARG JAVA_HOME=${USER_HOME}/java
 # set wso2 product configurations
 ARG WSO2_SERVER=wso2am-analytics
 ARG WSO2_SERVER_VERSION=2.1.0
-ARG WSO2_SERVER_PACK=${WSO2_SERVER}-${WSO2_SERVER_VERSION}
+ARG WSO2_SERVER_DIST=${WSO2_SERVER}-${WSO2_SERVER_VERSION}
 ARG WSO2_SERVER_HOME=${USER_HOME}/${WSO2_SERVER}-${WSO2_SERVER_VERSION}
 
 # install required packages
@@ -51,8 +51,8 @@ RUN groupadd --system -g ${USER_GROUP_ID} ${USER_GROUP} && \
  useradd --system --create-home --home-dir ${USER_HOME} --no-log-init -g ${USER_GROUP_ID} -u ${USER_ID} ${USER}
 
 # copy the jdk and wso2 product distributions to user's home directory
-COPY --chown=wso2carbon:wso2 ${FILES}/${JDK_DIST} ${USER_HOME}/${JDK_DIST}
-COPY --chown=wso2carbon:wso2 ${FILES}/${WSO2_SERVER_DIST} ${USER_HOME}/${WSO2_SERVER_DIST}
+COPY --chown=wso2carbon:wso2 ${FILES}/${JDK} ${USER_HOME}/java/
+COPY --chown=wso2carbon:wso2 ${FILES}/${WSO2_SERVER_DIST}/ ${USER_HOME}/${WSO2_SERVER_DIST}/
 
 # set the user and work directory
 USER ${USER_ID}

dockerfiles/apim-analytics/README.md

@@ -16,10 +16,9 @@ git clone https://github.com/wso2/docker-apim.git
 ##### 2. Add JDK and WSO2 API Manager Analytics distributions to `<ANALYTICS_DOCKERFILE_HOME>/files`
 - Download [JDK 1.8](http://www.oracle.com/technetwork/java/javase/downloads/jdk8-downloads-2133151.html) 
 and extract that to `<ANALYTICS_DOCKERFILE_HOME>/files`.
-- Update the JDK version number given in the ```JDK_DIST``` argument in the Dockerfile.
 - Download the WSO2 API Manager Analytics 2.1.0 distribution (http://wso2.com/api-management/try-it/)
 and extract that to `<ANALYTICS_DOCKERFILE_HOME>/files`. <br>
-- Once both JDK and WSO2 API Manager distributions are extracted it may look as follows:
+- Once both JDK and WSO2 API Manager distributions are extracted the folder structure should be as follows;
 
  ```bash
  <ANALYTICS_DOCKERFILE_HOME>/files/jdk<version>/

dockerfiles/apim/Dockerfile

@@ -29,8 +29,8 @@ ARG USER_HOME=/home/${USER}
 # set dependant files directory
 ARG FILES=./files
 # set jdk configurations
-ARG JDK_DIST=jdk1.8.0_144
-ARG JAVA_HOME=${USER_HOME}/${JDK_DIST}
+ARG JDK=jdk1.8.0*
+ARG JAVA_HOME=${USER_HOME}/java
 # set wso2 product configurations
 ARG WSO2_SERVER=wso2am
 ARG WSO2_SERVER_VERSION=2.1.0
@@ -51,7 +51,7 @@ RUN groupadd --system -g ${USER_GROUP_ID} ${USER_GROUP} && \
  useradd --system --create-home --home-dir ${USER_HOME} --no-log-init -g ${USER_GROUP_ID} -u ${USER_ID} ${USER}
 
 # copy the jdk and wso2 product distributions to user's home directory
-COPY --chown=wso2carbon:wso2 ${FILES}/${JDK_DIST} ${USER_HOME}/${JDK_DIST}
+COPY --chown=wso2carbon:wso2 ${FILES}/${JDK} ${USER_HOME}/java/
 COPY --chown=wso2carbon:wso2 ${FILES}/${WSO2_SERVER_DIST} ${USER_HOME}/${WSO2_SERVER_DIST}
 
 # set the user and work directory

dockerfiles/apim/README.md

@@ -17,10 +17,9 @@ git clone https://github.com/wso2/docker-apim.git
 ##### 2. Add JDK and WSO2 API Manager distributions to `<AM_DOCKERFILE_HOME>/files`
 - Download [JDK 1.8](http://www.oracle.com/technetwork/java/javase/downloads/jdk8-downloads-2133151.html) 
 and extract that in `<AM_DOCKERFILE_HOME>/files` folder.
-- Update the JDK version number given in the ```JDK_DIST``` argument in the Dockerfile.
 - Download the WSO2 API Manager 2.1.0 distribution (http://wso2.com/api-management/try-it/)
 and extract that in `<AM_DOCKERFILE_HOME>/files` folder.
-- Once both JDK and WSO2 API Manager distributions are extracted it may look as follows:
+- Once both JDK and WSO2 API Manager distributions are extracted the folder structure should be as follows;
 
  ```bash
  <AM_DOCKERFILE_HOME>/files/jdk<version>/

dockerfiles/is-as-km/Dockerfile

@@ -29,12 +29,12 @@ ARG USER_HOME=/home/${USER}
 # set dependant files directory
 ARG FILES=./files
 # set jdk configurations
-ARG JDK_DIST=jdk1.8.0_144
-ARG JAVA_HOME=${USER_HOME}/${JDK_DIST}
+ARG JDK=jdk1.8.0*
+ARG JAVA_HOME=${USER_HOME}/java
 # set wso2 product configurations
 ARG WSO2_SERVER=wso2is-km
 ARG WSO2_SERVER_VERSION=5.3.0
-ARG WSO2_SERVER_PACK=${WSO2_SERVER}-${WSO2_SERVER_VERSION}
+ARG WSO2_SERVER_DIST=${WSO2_SERVER}-${WSO2_SERVER_VERSION}
 ARG WSO2_SERVER_HOME=${USER_HOME}/${WSO2_SERVER}-${WSO2_SERVER_VERSION}
 
 # install required packages
@@ -51,7 +51,7 @@ RUN groupadd --system -g ${USER_GROUP_ID} ${USER_GROUP} && \
  useradd --system --create-home --home-dir ${USER_HOME} --no-log-init -g ${USER_GROUP_ID} -u ${USER_ID} ${USER}
 
 # copy the jdk and wso2 product distributions to user's home directory
-COPY --chown=wso2carbon:wso2 ${FILES}/${JDK_DIST} ${USER_HOME}/${JDK_DIST}
+COPY --chown=wso2carbon:wso2 ${FILES}/${JDK} ${USER_HOME}/java/
 COPY --chown=wso2carbon:wso2 ${FILES}/${WSO2_SERVER_DIST} ${USER_HOME}/${WSO2_SERVER_DIST}
 
 # set the user and work directory

dockerfiles/is-as-km/README.md

@@ -16,10 +16,9 @@ git clone https://github.com/wso2/docker-apim.git
 ##### 2. Add JDK and WSO2 API Manager distributions to `<IS_KM_DOCKERFILE_HOME>/files`
 - Download [JDK 1.8](http://www.oracle.com/technetwork/java/javase/downloads/jdk8-downloads-2133151.html) 
 and extract that to `<IS_KM_DOCKERFILE_HOME>/files`.
-- Update the JDK version number given in the ```JDK_DIST``` argument in the Dockerfile.
 - Download the WSO2 Identity Server as Key Manager 5.3.0 distribution (http://wso2.com/api-management/try-it/)
 and extract that to `<IS_KM_DOCKERFILE_HOME>/files`. <br>
-- Once both JDK and WSO2 API Manager distributions are extracted it may look as follows:
+- Once both JDK and WSO2 API Manager distributions are extracted the folder structure should be as follows;
 
  ```bash
  <IS_KM_DOCKERFILE_HOME>/files/jdk<version>/