From 71b7ae5fb812faf368a0ce2e968614962e9b7459 Mon Sep 17 00:00:00 2001 From: Andrea Giovine Date: Tue, 25 Aug 2020 17:13:59 +0200 Subject: update Dockerfile to use packages already build --- Dockerfile | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 4d5bda3..c37d416 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,7 @@ -FROM eciavatta/caronte-env:latest +FROM FROM ubuntu:20.04 + +# Install tools and libraries +RUN apt-get update && DEBIAN_FRONTEND=noninteractive apt-get install -qq git golang libpcap-dev pkg-config libhyperscan-dev npm ENV GIN_MODE release -- cgit v1.2.3-70-g09d2 From a9f417a538aeac7a0fb08649a1efc2d9bc5bb040 Mon Sep 17 00:00:00 2001 From: Andrea Giovine Date: Tue, 25 Aug 2020 17:53:30 +0200 Subject: Update Dockerfile --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index c37d416..9d186a7 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM FROM ubuntu:20.04 +FROM ubuntu:20.04 # Install tools and libraries RUN apt-get update && DEBIAN_FRONTEND=noninteractive apt-get install -qq git golang libpcap-dev pkg-config libhyperscan-dev npm -- cgit v1.2.3-70-g09d2 From df5cc3e40458bc3be97b798155f50e2b335241b9 Mon Sep 17 00:00:00 2001 From: Andrea Giovine Date: Sat, 5 Sep 2020 10:47:08 +0200 Subject: Remove unsed prereq --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 9d186a7..d7ab1f2 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,7 +1,7 @@ FROM ubuntu:20.04 # Install tools and libraries -RUN apt-get update && DEBIAN_FRONTEND=noninteractive apt-get install -qq git golang libpcap-dev pkg-config libhyperscan-dev npm +RUN apt-get update && DEBIAN_FRONTEND=noninteractive apt-get install -qq git golang libpcap-dev libhyperscan-dev npm ENV GIN_MODE release -- cgit v1.2.3-70-g09d2 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(-) 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