test libevent 2.1

3b8cbef1 · nanahira · 6ab4630a · 3b8cbef1 · 3b8cbef1
Commit 3b8cbef1 authored Jul 08, 2019 by nanahira
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 26 deletions

Dockerfile Dockerfile +1 -13

Dockerfile.lite Dockerfile.lite +1 -13

No files found.
--- a/Dockerfile
+++ b/Dockerfile
@@ -3,22 +3,10 @@ FROM node:12-stretch-slim

 # apt
 RUN apt update && \
-    env DEBIAN_FRONTEND=noninteractive apt install -y wget git build-essential libssl1.0-dev libsqlite3-dev mono-complete p7zip-full redis-server
+    env DEBIAN_FRONTEND=noninteractive apt install -y wget git build-essential libevent-dev libsqlite3-dev mono-complete p7zip-full redis-server

 RUN npm install -g pm2

-# libevent
-WORKDIR /
-RUN wget 'https://github.com/libevent/libevent/releases/download/release-2.0.22-stable/libevent-2.0.22-stable.tar.gz' -O libevent-2.0.22-stable.tar.gz --no-check-certificate && \
-    tar xf libevent-2.0.22-stable.tar.gz && \
-    cd libevent-2.0.22-stable/ && \
-    ./configure && \
-    make && \
-    make install && \
-    cd .. && \
-    bash -c 'ln -s /usr/local/lib/libevent-2.0.so.5 /usr/lib/libevent-2.0.so.5;ln -s /usr/local/lib/libevent_pthreads-2.0.so.5 /usr/lib/libevent_pthreads-2.0.so.5;ln -s /usr/local/lib/libevent-2.0.so.5 /usr/lib64/libevent-2.0.so.5;ln -s /usr/local/lib/libevent_pthreads-2.0.so.5 /usr/lib64/libevent_pthreads-2.0.so.5;exit 0' && \
-    rm -rf /libevent-2.0.22-stable.tar.gz /libevent-2.0.22-stable
-
 # srvpro
 COPY . /ygopro-server
 WORKDIR /ygopro-server

--- a/Dockerfile.lite
+++ b/Dockerfile.lite
@@ -3,19 +3,7 @@ FROM node:12-stretch-slim

 # apt
 RUN apt update && \
-    env DEBIAN_FRONTEND=noninteractive apt install -y wget git build-essential libssl1.0-dev libsqlite3-dev p7zip-full
-
-# libevent
-WORKDIR /
-RUN wget 'https://github.com/libevent/libevent/releases/download/release-2.0.22-stable/libevent-2.0.22-stable.tar.gz' -O libevent-2.0.22-stable.tar.gz --no-check-certificate && \
-    tar xf libevent-2.0.22-stable.tar.gz && \
-    cd libevent-2.0.22-stable/ && \
-    ./configure && \
-    make && \
-    make install && \
-    cd .. && \
-    bash -c 'ln -s /usr/local/lib/libevent-2.0.so.5 /usr/lib/libevent-2.0.so.5;ln -s /usr/local/lib/libevent_pthreads-2.0.so.5 /usr/lib/libevent_pthreads-2.0.so.5;ln -s /usr/local/lib/libevent-2.0.so.5 /usr/lib64/libevent-2.0.so.5;ln -s /usr/local/lib/libevent_pthreads-2.0.so.5 /usr/lib64/libevent_pthreads-2.0.so.5;exit 0' && \
-    rm -rf /libevent-2.0.22-stable.tar.gz /libevent-2.0.22-stable
+    env DEBIAN_FRONTEND=noninteractive apt install -y wget git build-essential libssl1.0-dev libevent-dev p7zip-full

 # srvpro
 COPY . /ygopro-server