Эх сурвалжийг харах

C/* - remove techempower dependencies (#3497)

* remove techempower dependencies from c

* fix h2o
Nate 7 жил өмнө
parent
commit
31974628d0

+ 1 - 3
frameworks/C/duda/duda.dockerfile

@@ -1,6 +1,4 @@
-FROM techempower/base:0.1
-
-RUN apt install git python -y
+FROM python:2.7
 
 COPY ./ ./
 # Get v0.31 (no official releases that work 2015-06-25)

+ 1 - 4
frameworks/C/facil.io/facil.io.dockerfile

@@ -1,13 +1,10 @@
-FROM techempower/base:0.1
+FROM gcc:6.4.0
 
 COPY ./ ./
 
 # using a common installation script will allow implementation variations (in future updates)
 RUN ./setup-common.sh
 
-# set compiler to gcc-6 (avoid gcc-4.8.4)... do we need this?
-# ENV CC="gcc-6"
-
 # we don't need more than 32K concurrent connections
 ENV CFLAGS="-DLIB_SOCK_MAX_CAPACITY=32768"
 

+ 4 - 4
frameworks/C/h2o/h2o.dockerfile

@@ -1,10 +1,10 @@
-FROM techempower/ruby-2.4:0.1
+FROM ruby:2.4
 
 COPY ./ ./
 
-RUN ls
-
-RUN apt install -yqq cmake automake libpq-dev libnuma-dev checkinstall autoconf pkg-config libtool python-sphinx libcunit1-dev nettle-dev libyaml-dev
+RUN apt update
+RUN apt install -yqq cmake automake libpq-dev libnuma-dev checkinstall autoconf pkg-config \
+    libtool python-sphinx libcunit1-dev nettle-dev libyaml-dev bison
 
 ### Install mustache-c
 

+ 10 - 2
frameworks/C/libreactor/libreactor.dockerfile

@@ -1,6 +1,14 @@
-FROM techempower/gcc-6:0.1
+FROM ubuntu:16.04
 
-COPY ./ ./
+RUN apt update -yqq
+RUN apt install -yqq software-properties-common python-software-properties wget make
+
+RUN add-apt-repository ppa:ubuntu-toolchain-r/test -y && \
+    apt update -yqq && \
+    apt install -yqq gcc-6 g++-6
+
+ADD ./ /libreactor
+WORKDIR /libreactor
 
 RUN wget -q https://github.com/fredrikwidlund/libdynamic/releases/download/v1.1.0/libdynamic-1.1.0.tar.gz && \
     tar xfz libdynamic-1.1.0.tar.gz && \

+ 7 - 5
frameworks/C/octane/octane.dockerfile

@@ -1,8 +1,10 @@
-FROM techempower/base:0.1
+FROM ubuntu:16.04
 
-COPY ./ ./
+ADD ./ /octane
+WORKDIR /octane
 
-RUN apt install -yqq cmake automake libtool
+RUN apt update -yqq && \
+    apt install -yqq software-properties-common build-essential git cmake automake libtool wget
 
 # May 22nd, 2017
 RUN git clone https://github.com/simongui/octane.git && \
@@ -10,7 +12,7 @@ RUN git clone https://github.com/simongui/octane.git && \
     git checkout 8c28b1b83f1aa2817a401a3e8437a0af4ec53c28 && \
     make
 
-ENV PATH=octane/build/:${PATH}
-ENV LD_PRELOAD=octane/lib/lockless_allocator/libllalloc.so.1.3
+ENV PATH=/octane/octane/build/:${PATH}
+ENV LD_PRELOAD=/octane/octane/lib/lockless_allocator/libllalloc.so.1.3
 
 CMD ["techempower_benchmarks"]

+ 4 - 3
frameworks/C/onion/onion.dockerfile

@@ -1,8 +1,9 @@
-FROM techempower/base:0.1
+FROM ubuntu:16.04
 
-COPY ./ ./
+ADD ./ /onion
+WORKDIR /onion
 
-RUN apt install -yqq cmake libmysqlclient-dev libjson0-dev libgnutls-dev libgcrypt-dev
+RUN apt update -yqq && apt install -yqq git cmake make libmysqlclient-dev libjson0-dev libgnutls-dev libgcrypt-dev
 
 ENV ONION_LOG noinfo