From 02996470c0f86fecea49f23b7818a4e7c230a63f Mon Sep 17 00:00:00 2001
From: Emiliano Ciavatta
Date: Wed, 30 Sep 2020 23:03:46 +0200
Subject: docker-compose now use eciavatta/caronte image

---
 Dockerfile         |  2 +-
 Dockerfile.env     | 49 -------------------------------------------------
 docker-compose.yml |  5 +----
 3 files changed, 2 insertions(+), 54 deletions(-)
 delete mode 100644 Dockerfile.env

diff --git a/Dockerfile b/Dockerfile
index cf7730b..4e097e5 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -27,7 +27,7 @@ FROM ubuntu:20.04
 COPY --from=BUILDSTAGE /caronte-build /caronte
 
 RUN apt-get update && \
-	DEBIAN_FRONTEND=noninteractive apt-get install -qq libpcap-dev libhyperscan-dev && \
+	DEBIAN_FRONTEND=noninteractive apt-get install -qq golang-1.14 pkg-config libpcap-dev libhyperscan-dev && \
 	rm -rf /var/lib/apt/lists/*
 
 ENV GIN_MODE release
diff --git a/Dockerfile.env b/Dockerfile.env
deleted file mode 100644
index e30663f..0000000
--- a/Dockerfile.env
+++ /dev/null
@@ -1,49 +0,0 @@
-FROM ubuntu:18.04
-
-ENV RAGEL_VERSION 6.10
-ENV HYPERSCAN_VERSION 5.2.1
-ENV GO_VERSION 1.14.1
-ENV NODE_VERSION v12.18.2
-ENV NODE_DISTRO linux-x64
-ENV PATH /usr/local/lib/nodejs/node-$NODE_VERSION-$NODE_DISTRO/bin:/usr/local/go/bin:$PATH
-
-# Install tools and libraries
-RUN apt-get update && apt-get install -y git wget make cmake build-essential python3 libpcap-dev pkg-config
-
-# Get Boost source to compile Hyperscan
-RUN wget https://dl.bintray.com/boostorg/release/1.72.0/source/boost_1_72_0.tar.gz -P /tmp/ && \
-        tar -C /tmp/ -xzf /tmp/boost_1_72_0.tar.gz
-
-# Get Ragel source and install it
-RUN wget http://www.colm.net/files/ragel/ragel-$RAGEL_VERSION.tar.gz -P /tmp && \
-        tar  -C /tmp/ -xzf /tmp/ragel-$RAGEL_VERSION.tar.gz && \
-        cd /tmp/ragel-$RAGEL_VERSION/ && \
-        ./configure && \
-        make && \
-        make install
-
-# Get Hyperscan source and install it
-RUN wget https://github.com/intel/hyperscan/archive/v$HYPERSCAN_VERSION.tar.gz -P /tmp && \
-        tar -C /tmp/ -xzf /tmp/v$HYPERSCAN_VERSION.tar.gz && \
-        cd /tmp/hyperscan-$HYPERSCAN_VERSION/ && \
-        mkdir build && \
-        cd build && \
-        cmake -G "Unix Makefiles" -DCMAKE_CXX_COMPILER=/usr/bin/g++ -DBUILD_STATIC_AND_SHARED=1 \
-                -DBOOST_ROOT=/tmp/boost_1_72_0 .. && \
-        make && \
-        make install && \
-        ln -s /usr/local/lib/libhs.so.5 /usr/lib/libhs.so.5
-
-# Get GoLang and install it
-RUN wget https://dl.google.com/go/go$GO_VERSION.linux-amd64.tar.gz -P /tmp && \
-        tar -C /usr/local -xzf /tmp/go$GO_VERSION.linux-amd64.tar.gz
-
-# Get NodeJs and install it
-RUN wget https://nodejs.org/dist/$NODE_VERSION/node-$NODE_VERSION-$NODE_DISTRO.tar.xz -P /tmp/ && \
-        mkdir -p /usr/local/lib/nodejs && \
-        tar -C /usr/local/lib/nodejs -xJf /tmp/node-$NODE_VERSION-$NODE_DISTRO.tar.xz
-
-# Remove source files
-RUN rm -rf /tmp/*
-
-CMD /bin/bash
diff --git a/docker-compose.yml b/docker-compose.yml
index 0feb831..de200a0 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -8,10 +8,7 @@ services:
     restart: always
 
   caronte:
-    build:
-      context: .
-      dockerfile: Dockerfile
-    image: caronte
+    image: eciavatta/caronte:latest
     ports:
       - "3333:3333"
     depends_on:
-- 
cgit v1.2.3-70-g09d2