Browse Source

[ci lang-only Clojure Groovy Java] remove TE dependencies for resin (#3542)

Michael Hixson 7 years ago
parent
commit
7c1ad4d3f6

+ 6 - 3
frameworks/Clojure/compojure/compojure-raw.dockerfile

@@ -4,6 +4,9 @@ COPY src src
 COPY project.clj project.clj
 RUN lein ring uberwar
 
-FROM techempower/resin-java8:0.1
-COPY --from=lein /compojure/target/hello-compojure-standalone.war ${RESIN_HOME}/webapps/ROOT.war
-CMD java -jar ${RESIN_HOME}/lib/resin.jar console
+FROM openjdk:8-jdk
+WORKDIR /resin
+RUN curl -sL http://www.caucho.com/download/resin-4.0.55.tar.gz | tar xz --strip-components=1
+RUN rm -rf webapps/*
+COPY --from=lein /compojure/target/hello-compojure-standalone.war webapps/ROOT.war
+CMD ["java", "-jar", "lib/resin.jar", "console"]

+ 6 - 3
frameworks/Clojure/compojure/compojure.dockerfile

@@ -4,6 +4,9 @@ COPY src src
 COPY project.clj project.clj
 RUN lein ring uberwar
 
-FROM techempower/resin-java8:0.1
-COPY --from=lein /compojure/target/hello-compojure-standalone.war ${RESIN_HOME}/webapps/ROOT.war
-CMD java -jar ${RESIN_HOME}/lib/resin.jar console
+FROM openjdk:8-jdk
+WORKDIR /resin
+RUN curl -sL http://www.caucho.com/download/resin-4.0.55.tar.gz | tar xz --strip-components=1
+RUN rm -rf webapps/*
+COPY --from=lein /compojure/target/hello-compojure-standalone.war webapps/ROOT.war
+CMD ["java", "-jar", "lib/resin.jar", "console"]

+ 8 - 4
frameworks/Groovy/grails/grails.dockerfile

@@ -1,4 +1,5 @@
-FROM techempower/resin-java8:0.1
+FROM openjdk:8-jdk
+
 WORKDIR /grails
 COPY grails-app grails-app
 COPY web-app web-app
@@ -9,7 +10,7 @@ ENV GRAILS_HOME /grails/grails-${GRAILS_VERSION}
 ENV GRAILS_WORK_DIR ${GRAILS_HOME}/.grails
 ENV GRAILS_AGENT_CACHE_DIR ${GRAILS_WORK_DIR}/.slcache
 
-RUN curl -sL -O http://dist.springframework.org.s3.amazonaws.com/release/GRAILS/grails-${GRAILS_VERSION}.zip
+RUN curl -sL -O https://github.com/grails/grails-core/releases/download/v${GRAILS_VERSION}/grails-${GRAILS_VERSION}.zip
 RUN unzip -q grails-${GRAILS_VERSION}.zip
 ENV PATH ${GRAILS_HOME}/bin:${PATH}
 
@@ -17,5 +18,8 @@ RUN grails -Dgrails.work.dir=${GRAILS_WORK_DIR} -non-interactive -plain-output r
 RUN grails -Dgrails.work.dir=${GRAILS_WORK_DIR} -non-interactive -plain-output compile
 RUN grails -Dgrails.work.dir=${GRAILS_WORK_DIR} prod -non-interactive -plain-output war
 
-RUN cp target/hello-0.1.war ${RESIN_HOME}/webapps/ROOT.war
-CMD java -jar ${RESIN_HOME}/lib/resin.jar console
+WORKDIR /resin
+RUN curl -sL http://www.caucho.com/download/resin-4.0.55.tar.gz | tar xz --strip-components=1
+RUN rm -rf webapps/*
+RUN cp /grails/target/hello-0.1.war webapps/ROOT.war
+CMD ["java", "-jar", "lib/resin.jar", "console"]

+ 6 - 3
frameworks/Java/activeweb/activeweb-jackson.dockerfile

@@ -5,6 +5,9 @@ COPY scripts scripts
 COPY src src
 RUN mvn package -DskipTests -q
 
-FROM techempower/resin:0.1
-COPY --from=maven /activeweb/target/activeweb.war ${RESIN_HOME}/webapps/ROOT.war
-CMD java -jar ${RESIN_HOME}/lib/resin.jar console
+FROM openjdk:9-jdk
+WORKDIR /resin
+RUN curl -sL http://www.caucho.com/download/resin-4.0.55.tar.gz | tar xz --strip-components=1
+RUN rm -rf webapps/*
+COPY --from=maven /activeweb/target/activeweb.war webapps/ROOT.war
+CMD ["java", "-jar", "lib/resin.jar", "console"]

+ 6 - 3
frameworks/Java/activeweb/activeweb.dockerfile

@@ -5,6 +5,9 @@ COPY scripts scripts
 COPY src src
 RUN mvn package -DskipTests -q
 
-FROM techempower/resin:0.1
-COPY --from=maven /activeweb/target/activeweb.war ${RESIN_HOME}/webapps/ROOT.war
-CMD java -jar ${RESIN_HOME}/lib/resin.jar console
+FROM openjdk:9-jdk
+WORKDIR /resin
+RUN curl -sL http://www.caucho.com/download/resin-4.0.55.tar.gz | tar xz --strip-components=1
+RUN rm -rf webapps/*
+COPY --from=maven /activeweb/target/activeweb.war webapps/ROOT.war
+CMD ["java", "-jar", "lib/resin.jar", "console"]

+ 6 - 3
frameworks/Java/curacao/curacao.dockerfile

@@ -4,6 +4,9 @@ COPY pom.xml pom.xml
 COPY src src
 RUN mvn compile war:war -q
 
-FROM techempower/resin:0.1
-COPY --from=maven /curacao/target/curacao.war ${RESIN_HOME}/webapps/ROOT.war
-CMD java -jar ${RESIN_HOME}/lib/resin.jar console
+FROM openjdk:9-jdk
+WORKDIR /resin
+RUN curl -sL http://www.caucho.com/download/resin-4.0.55.tar.gz | tar xz --strip-components=1
+RUN rm -rf webapps/*
+COPY --from=maven /curacao/target/curacao.war webapps/ROOT.war
+CMD ["java", "-jar", "lib/resin.jar", "console"]

+ 1 - 1
frameworks/Java/gemini/Docroot/WEB-INF/resin.xml

@@ -3,7 +3,7 @@
 
   <cluster id="">
     
-    <resin:import path="${RESIN_HOME}/conf/app-default.xml" />
+    <resin:import path="/resin/conf/app-default.xml" />
     <log name="" level="config" path="stdout:" timestamp="[%H:%M:%S.%s] " />
 
     <server id="">

+ 5 - 4
frameworks/Java/gemini/gemini-mysql.dockerfile

@@ -1,5 +1,5 @@
 FROM openjdk:9-jdk-slim as ant
-RUN apt update -qqy && apt install -qqy ant
+RUN apt update -qqy && apt install -qqy ant curl
 
 WORKDIR /gemini
 COPY Docroot Docroot
@@ -14,6 +14,7 @@ RUN mkdir Docroot/WEB-INF/lib
 RUN ant resolve
 RUN ant compile
 
-FROM techempower/resin:0.1
-COPY --from=ant /gemini /gemini
-CMD java -jar ${RESIN_HOME}/lib/resin.jar -conf /gemini/Docroot/WEB-INF/resin.xml console
+WORKDIR /resin
+RUN curl -sL http://www.caucho.com/download/resin-4.0.55.tar.gz | tar xz --strip-components=1
+RUN rm -rf webapps/*
+CMD ["java", "-jar", "lib/resin.jar", "-conf", "/gemini/Docroot/WEB-INF/resin.xml", "console"]

+ 5 - 4
frameworks/Java/gemini/gemini-postgres.dockerfile

@@ -1,5 +1,5 @@
 FROM openjdk:9-jdk-slim as ant
-RUN apt update -qqy && apt install -qqy ant
+RUN apt update -qqy && apt install -qqy ant curl
 
 WORKDIR /gemini
 COPY Docroot Docroot
@@ -14,6 +14,7 @@ RUN mkdir Docroot/WEB-INF/lib
 RUN ant resolve
 RUN ant compile
 
-FROM techempower/resin:0.1
-COPY --from=ant /gemini /gemini
-CMD java -jar ${RESIN_HOME}/lib/resin.jar -conf /gemini/Docroot/WEB-INF/resin.xml console
+WORKDIR /resin
+RUN curl -sL http://www.caucho.com/download/resin-4.0.55.tar.gz | tar xz --strip-components=1
+RUN rm -rf webapps/*
+CMD ["java", "-jar", "lib/resin.jar", "-conf", "/gemini/Docroot/WEB-INF/resin.xml", "console"]

+ 5 - 4
frameworks/Java/gemini/gemini.dockerfile

@@ -1,5 +1,5 @@
 FROM openjdk:9-jdk-slim as ant
-RUN apt update -qqy && apt install -qqy ant
+RUN apt update -qqy && apt install -qqy ant curl
 
 WORKDIR /gemini
 COPY Docroot Docroot
@@ -14,6 +14,7 @@ RUN mkdir Docroot/WEB-INF/lib
 RUN ant resolve
 RUN ant compile
 
-FROM techempower/resin:0.1
-COPY --from=ant /gemini /gemini
-CMD java -jar ${RESIN_HOME}/lib/resin.jar -conf /gemini/Docroot/WEB-INF/resin.xml console
+WORKDIR /resin
+RUN curl -sL http://www.caucho.com/download/resin-4.0.55.tar.gz | tar xz --strip-components=1
+RUN rm -rf webapps/*
+CMD ["java", "-jar", "lib/resin.jar", "-conf", "/gemini/Docroot/WEB-INF/resin.xml", "console"]

+ 6 - 3
frameworks/Java/revenj-jvm/revenj-jvm.dockerfile

@@ -14,6 +14,9 @@ RUN unzip -o dsl-compiler.zip
 RUN rm dsl-compiler.zip
 RUN mvn compile war:war -q
 
-FROM techempower/resin-java8:0.1
-COPY --from=maven /revenj-jvm/target/revenj.war ${RESIN_HOME}/webapps/ROOT.war
-CMD java -jar ${RESIN_HOME}/lib/resin.jar console
+FROM openjdk:8-jdk
+WORKDIR /resin
+RUN curl -sL http://www.caucho.com/download/resin-4.0.55.tar.gz | tar xz --strip-components=1
+RUN rm -rf webapps/*
+COPY --from=maven /revenj-jvm/target/revenj.war webapps/ROOT.war
+CMD ["java", "-jar", "lib/resin.jar", "console"]

+ 6 - 3
frameworks/Java/servlet/servlet-afterburner.dockerfile

@@ -4,6 +4,9 @@ COPY src src
 COPY pom.xml pom.xml
 RUN mvn compile war:war -q -P afterburner
 
-FROM techempower/resin:0.1
-COPY --from=maven /servlet/target/servlet.war ${RESIN_HOME}/webapps/ROOT.war
-CMD java -jar ${RESIN_HOME}/lib/resin.jar console
+FROM openjdk:9-jdk
+WORKDIR /resin
+RUN curl -sL http://www.caucho.com/download/resin-4.0.55.tar.gz | tar xz --strip-components=1
+RUN rm -rf webapps/*
+COPY --from=maven /servlet/target/servlet.war webapps/ROOT.war
+CMD ["java", "-jar", "lib/resin.jar", "console"]

+ 6 - 3
frameworks/Java/servlet/servlet-cjs.dockerfile

@@ -4,6 +4,9 @@ COPY src src
 COPY pom.xml pom.xml
 RUN mvn compile war:war -q -P cjs
 
-FROM techempower/resin:0.1
-COPY --from=maven /servlet/target/servlet.war ${RESIN_HOME}/webapps/ROOT.war
-CMD java -jar ${RESIN_HOME}/lib/resin.jar console
+FROM openjdk:9-jdk
+WORKDIR /resin
+RUN curl -sL http://www.caucho.com/download/resin-4.0.55.tar.gz | tar xz --strip-components=1
+RUN rm -rf webapps/*
+COPY --from=maven /servlet/target/servlet.war webapps/ROOT.war
+CMD ["java", "-jar", "lib/resin.jar", "console"]

+ 6 - 3
frameworks/Java/servlet/servlet-mysql.dockerfile

@@ -4,6 +4,9 @@ COPY src src
 COPY pom.xml pom.xml
 RUN mvn compile war:war -q -P mysql
 
-FROM techempower/resin:0.1
-COPY --from=maven /servlet/target/servlet.war ${RESIN_HOME}/webapps/ROOT.war
-CMD java -jar ${RESIN_HOME}/lib/resin.jar console
+FROM openjdk:9-jdk
+WORKDIR /resin
+RUN curl -sL http://www.caucho.com/download/resin-4.0.55.tar.gz | tar xz --strip-components=1
+RUN rm -rf webapps/*
+COPY --from=maven /servlet/target/servlet.war webapps/ROOT.war
+CMD ["java", "-jar", "lib/resin.jar", "console"]

+ 6 - 3
frameworks/Java/servlet/servlet-postgresql.dockerfile

@@ -4,6 +4,9 @@ COPY src src
 COPY pom.xml pom.xml
 RUN mvn compile war:war -q -P postgresql
 
-FROM techempower/resin:0.1
-COPY --from=maven /servlet/target/servlet.war ${RESIN_HOME}/webapps/ROOT.war
-CMD java -jar ${RESIN_HOME}/lib/resin.jar console
+FROM openjdk:9-jdk
+WORKDIR /resin
+RUN curl -sL http://www.caucho.com/download/resin-4.0.55.tar.gz | tar xz --strip-components=1
+RUN rm -rf webapps/*
+COPY --from=maven /servlet/target/servlet.war webapps/ROOT.war
+CMD ["java", "-jar", "lib/resin.jar", "console"]

+ 6 - 3
frameworks/Java/servlet/servlet.dockerfile

@@ -4,6 +4,9 @@ COPY src src
 COPY pom.xml pom.xml
 RUN mvn compile war:war -q
 
-FROM techempower/resin:0.1
-COPY --from=maven /servlet/target/servlet.war ${RESIN_HOME}/webapps/ROOT.war
-CMD java -jar ${RESIN_HOME}/lib/resin.jar console
+FROM openjdk:9-jdk
+WORKDIR /resin
+RUN curl -sL http://www.caucho.com/download/resin-4.0.55.tar.gz | tar xz --strip-components=1
+RUN rm -rf webapps/*
+COPY --from=maven /servlet/target/servlet.war webapps/ROOT.war
+CMD ["java", "-jar", "lib/resin.jar", "console"]

+ 6 - 3
frameworks/Java/spark/spark.dockerfile

@@ -4,6 +4,9 @@ COPY src src
 COPY pom.xml pom.xml
 RUN mvn package -q
 
-FROM techempower/resin-java8:0.1
-COPY --from=maven /spark/target/spark.war ${RESIN_HOME}/webapps/ROOT.war
-CMD java -jar ${RESIN_HOME}/lib/resin.jar console
+FROM openjdk:8-jdk
+WORKDIR /resin
+RUN curl -sL http://www.caucho.com/download/resin-4.0.55.tar.gz | tar xz --strip-components=1
+RUN rm -rf webapps/*
+COPY --from=maven /spark/target/spark.war webapps/ROOT.war
+CMD ["java", "-jar", "lib/resin.jar", "console"]

+ 6 - 3
frameworks/Java/tapestry/tapestry.dockerfile

@@ -4,6 +4,9 @@ COPY src src
 COPY pom.xml pom.xml
 RUN mvn compile war:war -q
 
-FROM techempower/resin-java8:0.1
-COPY --from=maven /tapestry/target/tapestry.war ${RESIN_HOME}/webapps/ROOT.war
-CMD java -jar ${RESIN_HOME}/lib/resin.jar console
+FROM openjdk:8-jdk
+WORKDIR /resin
+RUN curl -sL http://www.caucho.com/download/resin-4.0.55.tar.gz | tar xz --strip-components=1
+RUN rm -rf webapps/*
+COPY --from=maven /tapestry/target/tapestry.war webapps/ROOT.war
+CMD ["java", "-jar", "lib/resin.jar", "console"]

+ 6 - 3
frameworks/Java/wicket/wicket.dockerfile

@@ -4,6 +4,9 @@ COPY src src
 COPY pom.xml pom.xml
 RUN mvn compile war:war -q
 
-FROM techempower/resin:0.1
-COPY --from=maven /wicket/target/hellowicket-1.0.war ${RESIN_HOME}/webapps/ROOT.war
-CMD java -jar ${RESIN_HOME}/lib/resin.jar console
+FROM openjdk:8-jdk
+WORKDIR /resin
+RUN curl -sL http://www.caucho.com/download/resin-4.0.55.tar.gz | tar xz --strip-components=1
+RUN rm -rf webapps/*
+COPY --from=maven /wicket/target/hellowicket-1.0.war webapps/ROOT.war
+CMD ["java", "-jar", "lib/resin.jar", "console"]