From a33e8f2c05ba23372f02db6375f55644bfe0fa66 Mon Sep 17 00:00:00 2001 From: Tobias Reisinger Date: Sat, 17 Aug 2019 02:07:01 +0200 Subject: [PATCH] fix: better Dockerfiles --- Dockerfile | 8 +++++++- Dockerfile.drogon | 27 +++++++++++++++++++++++++++ 2 files changed, 34 insertions(+), 1 deletion(-) create mode 100644 Dockerfile.drogon diff --git a/Dockerfile b/Dockerfile index 653fa2a..d5077a0 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM drogonframework/drogon +FROM drogonframework/drogon AS installer ENV CORE_ROOT=$IROOT/core @@ -10,4 +10,10 @@ WORKDIR $CORE_ROOT RUN ./build.sh +FROM drogonframework/drogon + +COPY --from=installer /srv/core /srv/core + +EXPOSE 5000 + ENTRYPOINT ["/srv/core"] diff --git a/Dockerfile.drogon b/Dockerfile.drogon new file mode 100644 index 0000000..77ec13b --- /dev/null +++ b/Dockerfile.drogon @@ -0,0 +1,27 @@ +FROM ubuntu:18.04 + +RUN apt-get update -yqq && \ + apt-get install -yqq --no-install-recommends software-properties-common && \ + apt-get install -yqq --no-install-recommends sudo curl wget cmake locales git \ + openssl libssl-dev libjsoncpp-dev uuid-dev zlib1g-dev postgresql-server-dev-all \ + libmariadbclient-dev libsqlite3-dev gcc-8 g++-8 && \ + locale-gen en_US.UTF-8 + +ENV LANG en_US.UTF-8 +ENV LANGUAGE en_US:en +ENV LC_ALL en_US.UTF-8 + +ENV CC=gcc-8 +ENV CXX=g++-8 +ENV AR=gcc-ar-8 +ENV RANLIB=gcc-ranlib-8 + +ENV IROOT=/install +ENV DROGON_ROOT=$IROOT/drogon + +WORKDIR $IROOT +ADD https://api.github.com/repos/an-tao/drogon/git/refs/heads/master version.json +RUN git clone https://github.com/an-tao/drogon + +WORKDIR $DROGON_ROOT +RUN ./build.sh