Browse Source

Ur/* remove TE dependencies and urweb-base (#3510)

* Ur/* remove TE dependencies and urweb-base

* fix urweb mysql
Nate 7 years ago
parent
commit
4841f45892

+ 0 - 19
frameworks/Ur/urweb/urweb-base.dockerfile

@@ -1,19 +0,0 @@
-FROM techempower/base:0.1
-
-COPY ./ ./
-
-ENV URWEB_VERSION=20160621
-ENV COMPILER=/urweb-build
-
-RUN apt install -yqq mlton libssl-dev libpq-dev libmysqlclient-dev
-RUN mkdir -p $COMPILER && \
-    wget -q http://www.impredicative.com/ur/urweb-$URWEB_VERSION.tgz && \
-    tar xf urweb-$URWEB_VERSION.tgz && \
-    cd urweb-$URWEB_VERSION && \
-    ./configure --prefix=$COMPILER && \
-    make && \
-    make install
-
-ENV URWEB_HOME=${COMPILER}
-ENV LD_LIBRARY_PATH=${COMPILER}/lib
-ENV PATH=${COMPILER}/bin:${PATH}

+ 21 - 1
frameworks/Ur/urweb/urweb-mysql.dockerfile

@@ -1,4 +1,24 @@
-FROM techempower/urweb-base:0.1
+FROM ubuntu:16.04
+
+ADD ./ /urweb
+WORKDIR /urweb
+
+ENV URWEB_VERSION=20160621
+ENV COMPILER=/urweb/urweb-build
+
+RUN apt update -yqq && apt install -yqq make wget mlton libssl-dev libpq-dev libmysqlclient-dev
+
+RUN mkdir -p $COMPILER && \
+    wget -q http://www.impredicative.com/ur/urweb-$URWEB_VERSION.tgz && \
+    tar xf urweb-$URWEB_VERSION.tgz && \
+    cd urweb-$URWEB_VERSION && \
+    ./configure --prefix=$COMPILER && \
+    make && \
+    make install
+
+ENV URWEB_HOME=${COMPILER}
+ENV LD_LIBRARY_PATH=${COMPILER}/lib
+ENV PATH=${COMPILER}/bin:${PATH}
 
 RUN urweb -dbms mysql -db "dbname=hello_world user=benchmarkdbuser password=benchmarkdbpass host=tfb-database" bench
 

+ 21 - 1
frameworks/Ur/urweb/urweb.dockerfile

@@ -1,4 +1,24 @@
-FROM techempower/urweb-base:0.1
+FROM ubuntu:16.04
+
+ADD ./ /urweb
+WORKDIR /urweb
+
+ENV URWEB_VERSION=20160621
+ENV COMPILER=/urweb/urweb-build
+
+RUN apt update -yqq && apt install -yqq build-essential wget mlton libssl-dev libpq-dev libmysqlclient-dev
+
+RUN mkdir -p $COMPILER && \
+    wget -q http://www.impredicative.com/ur/urweb-$URWEB_VERSION.tgz && \
+    tar xf urweb-$URWEB_VERSION.tgz && \
+    cd urweb-$URWEB_VERSION && \
+    ./configure --prefix=$COMPILER && \
+    make && \
+    make install
+
+ENV URWEB_HOME=${COMPILER}
+ENV LD_LIBRARY_PATH=${COMPILER}/lib
+ENV PATH=${COMPILER}/bin:${PATH}
 
 RUN urweb -db "dbname=hello_world user=benchmarkdbuser password=benchmarkdbpass host=tfb-database" bench