Browse Source

[ci fw-only JavaScript/ringojs] ringojs remove TE dependencies (#3530)

Michael Hixson 7 years ago
parent
commit
9a0eb669d4

+ 0 - 11
frameworks/JavaScript/ringojs/ringo-base.dockerfile

@@ -1,11 +0,0 @@
-FROM techempower/java8:0.1
-
-COPY ./ ./
-
-ENV RINGOJS_VERSION="1.1.0"
-ENV RINGOJS_HOME=/ringojs-$RINGOJS_VERSION
-
-RUN wget -q https://github.com/ringo/ringojs/releases/download/v$RINGOJS_VERSION/ringojs-$RINGOJS_VERSION.tar.gz && \
-    tar xf ringojs-$RINGOJS_VERSION.tar.gz
-
-ENV PATH=${RINGOJS_HOME}/bin:${PATH}

+ 18 - 5
frameworks/JavaScript/ringojs/ringojs-convenient.dockerfile

@@ -1,8 +1,21 @@
-FROM techempower/ringo-base:0.1
+FROM openjdk:8-jdk
 
 
-RUN ringo-admin install grob/ringo-sqlstore && \
-    ringo-admin install ringo/stick && \
-    ringo-admin install orfon/reinhardt && \
-    (cd $RINGOJS_HOME/packages/ringo-sqlstore/jars && curl -s -O https://repo1.maven.org/maven2/mysql/mysql-connector-java/5.1.39/mysql-connector-java-5.1.39.jar)
+WORKDIR /ringojs_framework
+ENV RINGOJS_VERSION 1.1.0
+RUN curl -sL -O https://github.com/ringo/ringojs/releases/download/v${RINGOJS_VERSION}/ringojs-${RINGOJS_VERSION}.tar.gz
+RUN tar xf ringojs-${RINGOJS_VERSION}.tar.gz
+ENV RINGOJS_HOME /ringojs_framework/ringojs-${RINGOJS_VERSION}
+ENV PATH ${RINGOJS_HOME}/bin:${PATH}
+
+WORKDIR /ringojs_app
+COPY app app
+COPY config config
+COPY templates templates
+COPY ringo-convenient-main.js ringo-convenient-main.js
+
+RUN ringo-admin install grob/ringo-sqlstore
+RUN ringo-admin install ringo/stick
+RUN ringo-admin install orfon/reinhardt
+RUN curl -sL -o ${RINGOJS_HOME}/packages/ringo-sqlstore/jars/mysql.jar https://repo1.maven.org/maven2/mysql/mysql-connector-java/5.1.46/mysql-connector-java-5.1.46.jar
 
 
 CMD ["ringo", "--production", "-J-server", "-J-Xmx1g", "-J-Xms1g", "ringo-convenient-main.js", "--host", "0.0.0.0"]
 CMD ["ringo", "--production", "-J-server", "-J-Xmx1g", "-J-Xms1g", "ringo-convenient-main.js", "--host", "0.0.0.0"]

+ 17 - 4
frameworks/JavaScript/ringojs/ringojs.dockerfile

@@ -1,7 +1,20 @@
-FROM techempower/ringo-base:0.1
+FROM openjdk:8-jdk
 
 
-RUN ringo-admin install oberhamsi/sql-ringojs-client && \
-    ringo-admin install orfon/reinhardt && \
-    (cd $RINGOJS_HOME/packages/sql-ringojs-client/jars && curl -s -o mysql.jar https://repo1.maven.org/maven2/mysql/mysql-connector-java/5.1.39/mysql-connector-java-5.1.39.jar)
+WORKDIR /ringojs_framework
+ENV RINGOJS_VERSION 1.1.0
+RUN curl -sL -O https://github.com/ringo/ringojs/releases/download/v${RINGOJS_VERSION}/ringojs-${RINGOJS_VERSION}.tar.gz
+RUN tar xf ringojs-${RINGOJS_VERSION}.tar.gz
+ENV RINGOJS_HOME /ringojs_framework/ringojs-${RINGOJS_VERSION}
+ENV PATH ${RINGOJS_HOME}/bin:${PATH}
+
+WORKDIR /ringojs_app
+COPY app app
+COPY config config
+COPY templates templates
+COPY ringo-main.js ringo-main.js
+
+RUN ringo-admin install oberhamsi/sql-ringojs-client
+RUN ringo-admin install orfon/reinhardt
+RUN curl -sL -o ${RINGOJS_HOME}/packages/sql-ringojs-client/jars/mysql.jar https://repo1.maven.org/maven2/mysql/mysql-connector-java/5.1.46/mysql-connector-java-5.1.46.jar
 
 
 CMD ["ringo", "--production", "-J-server", "-J-Xmx1g", "-J-Xms1g", "ringo-main.js", "--host", "0.0.0.0"]
 CMD ["ringo", "--production", "-J-server", "-J-Xmx1g", "-J-Xms1g", "ringo-main.js", "--host", "0.0.0.0"]