Bladeren bron

Nim/jester - remove TE dependencies, update nim and jester (#3508)

Nate 7 jaren geleden
bovenliggende
commit
2e1463a90c

+ 5 - 3
frameworks/Nim/jester/jester.dockerfile

@@ -1,9 +1,11 @@
-FROM techempower/nimble:0.1
+FROM nimlang/nim:0.16.0
 
-# 2015-06-25
+RUN apt update -yqq && apt install -yqq nginx
+
+# 2016-10-01
 RUN git clone https://github.com/dom96/jester.git && \
     cd jester && \
-    git checkout 71b8cc069a0d271d619c2dc41bc6479047885587 && \
+    git checkout 22f6ce61924a8f4d170c54f1a6709f898085deb4 && \
     nimble update && \
     echo 'y' | nimble install
 

+ 0 - 21
toolset/setup/docker/languages/nim.dockerfile

@@ -1,21 +0,0 @@
-FROM techempower/nginx:0.1
-
-ENV NIM_VERSION="0.11.2"
-ENV NIM_CSOURCES="6bf2282"
-
-RUN wget https://github.com/nim-lang/Nim/archive/v$NIM_VERSION.tar.gz
-RUN tar xf v$NIM_VERSION.tar.gz
-RUN mv Nim-$NIM_VERSION nim
-
-RUN cd nim && \
-    git clone git://github.com/nim-lang/csources.git && \
-    cd csources && \
-    git checkout $NIM_CSOURCES && \
-    sh build.sh && \
-    cd .. && \
-
-    bin/nim c koch && \
-    ./koch boot -d:release
-
-ENV NIM_HOME=/nim
-ENV PATH=${NIM_HOME}/bin:${PATH}

+ 0 - 11
toolset/setup/docker/systools/nimble.dockerfile

@@ -1,11 +0,0 @@
-FROM techempower/nim:0.1
-  
-ENV NIMBLE_VERSION="0.6.2"
-
-RUN cd $NIM_HOME && \
-    wget https://github.com/nim-lang/nimble/archive/v$NIMBLE_VERSION.tar.gz && \
-    tar xf v$NIMBLE_VERSION.tar.gz && \
-    mv nimble-$NIMBLE_VERSION nimble && \
-    cd nimble && \
-    ../bin/nim c src/nimble && \
-    mv src/nimble ../bin/