added second half

toschoch · Dec 9, 2018 · 6fd8db8 · 6fd8db8
1 parent 441b13f
commit 6fd8db8
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 21 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -31,23 +31,22 @@ RUN apk add --no-cache --virtual=.build-dependencies wget ca-certificates && \
  rm "$ALPINE_GLIBC_BASE_PACKAGE_FILENAME" \
  "$ALPINE_GLIBC_BIN_PACKAGE_FILENAME" \
  "$ALPINE_GLIBC_I18N_PACKAGE_FILENAME" && \
- apk add --no-cache --virtual=build-dependencies wget ca-certificates unzip 
- # && \
- # cd /tmp && \
- # wget --header "Cookie: oraclelicense=accept-securebackup-cookie;" "https://download.oracle.com/otn-pub/java/jdk/${JAVA_VERSION}u${JAVA_UPDATE}-b${JAVA_BUILD}/${JAVA_PATH}/jdk-${JAVA_VERSION}u${JAVA_UPDATE}-linux-arm32-vfp-hflt.tar.gz" && \
- # cd /tmp && tar -xzf "jdk-${JAVA_VERSION}u${JAVA_UPDATE}-linux-arm32-vfp-hflt.tar.gz" && \
- # mkdir -p "/usr/lib/jvm" && \
- # mv "/tmp/jdk1.${JAVA_VERSION}.0_${JAVA_UPDATE}" "/usr/lib/jvm/java-${JAVA_VERSION}-oracle" && \
- # ln -s "java-${JAVA_VERSION}-oracle" "$JAVA_HOME" && \
- # ln -s "$JAVA_HOME/bin/"* "/usr/bin/" && \
- # rm -rf "$JAVA_HOME/"*src.zip && \
- # wget --header "Cookie: oraclelicense=accept-securebackup-cookie;" \
- # "https://download.oracle.com/otn-pub/java/jce/${JAVA_VERSION}/jce_policy-${JAVA_VERSION}.zip" && \
- # unzip -jo -d "${JAVA_HOME}/jre/lib/security" "jce_policy-${JAVA_VERSION}.zip" && \
- # rm "${JAVA_HOME}/jre/lib/security/README.txt" && \
- # apk del build-dependencies && \
- # rm "/tmp/"* && \
- # echo 'public class Main { public static void main(String[] args) { System.out.println("Java code is running fine!"); } }' > Main.java && \
- # javac Main.java && \
- # java Main && \
- # rm -r "/tmp/"*
+ apk add --no-cache --virtual=build-dependencies wget ca-certificates unzip && \
+ cd /tmp && \
+ wget --header "Cookie: oraclelicense=accept-securebackup-cookie;" "https://download.oracle.com/otn-pub/java/jdk/${JAVA_VERSION}u${JAVA_UPDATE}-b${JAVA_BUILD}/${JAVA_PATH}/jdk-${JAVA_VERSION}u${JAVA_UPDATE}-linux-arm32-vfp-hflt.tar.gz" && \
+ cd /tmp && tar -xzf "jdk-${JAVA_VERSION}u${JAVA_UPDATE}-linux-arm32-vfp-hflt.tar.gz" && \
+ mkdir -p "/usr/lib/jvm" && \
+ mv "/tmp/jdk1.${JAVA_VERSION}.0_${JAVA_UPDATE}" "/usr/lib/jvm/java-${JAVA_VERSION}-oracle" && \
+ ln -s "java-${JAVA_VERSION}-oracle" "$JAVA_HOME" && \
+ ln -s "$JAVA_HOME/bin/"* "/usr/bin/" && \
+ rm -rf "$JAVA_HOME/"*src.zip && \
+ wget --header "Cookie: oraclelicense=accept-securebackup-cookie;" \
+ "https://download.oracle.com/otn-pub/java/jce/${JAVA_VERSION}/jce_policy-${JAVA_VERSION}.zip" && \
+ unzip -jo -d "${JAVA_HOME}/jre/lib/security" "jce_policy-${JAVA_VERSION}.zip" && \
+ rm "${JAVA_HOME}/jre/lib/security/README.txt" && \
+ apk del build-dependencies && \
+ rm "/tmp/"* && \
+ echo 'public class Main { public static void main(String[] args) { System.out.println("Java code is running fine!"); } }' > Main.java && \
+ javac Main.java && \
+ java Main && \
+ rm -r "/tmp/"*
diff --git a/Jenkinsfile b/Jenkinsfile
@@ -39,7 +39,7 @@ node('docker') {
  }
 
  stage('Push Image') {
- docker.withRegistry('https://hub.docker.com/','docker public') {
+ docker.withRegistry('registry.hub.docker.io','docker public') {
  builtImage.push()
  }
  }