From be3e7e4a98af2cd570db3a50d9037ee679b38f24 Mon Sep 17 00:00:00 2001
From: Andrea Giovine
Date: Sat, 5 Sep 2020 12:36:05 +0200
Subject: Use golang-1.14

---
 Dockerfile | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

(limited to 'Dockerfile')

diff --git a/Dockerfile b/Dockerfile
index d7ab1f2..0092628 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,7 +1,9 @@
 FROM ubuntu:20.04
 
 # Install tools and libraries
-RUN apt-get update && DEBIAN_FRONTEND=noninteractive apt-get install -qq git golang libpcap-dev libhyperscan-dev npm
+RUN apt-get update && DEBIAN_FRONTEND=noninteractive apt-get install -qq git golang-1.14 pkg-config libpcap-dev libhyperscan-dev yarnpkg
+
+RUN ln -sf ../lib/go-1.14/bin/go /usr/bin/go
 
 ENV GIN_MODE release
 
@@ -11,6 +13,6 @@ WORKDIR /caronte
 
 RUN go mod download && go build
 
-RUN npm i --global yarn && cd frontend && yarn install && yarn build
+RUN cd frontend && yarnpkg install && yarnpkg build
 
 CMD ./caronte
-- 
cgit v1.2.3-70-g09d2