From f84b709a618b67684a8505be3efd4cd92477bfc6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rafa=C5=82=20Bugajewski?= Date: Sat, 19 Jun 2021 09:37:42 +0000 Subject: [PATCH] Updated Dockerfile to Ubuntu 20.04 & Fixed Timezone Hangup (#895) Co-authored-by: an-tao Co-authored-by: Martin Chang --- docker/arch/Dockerfile | 2 +- docker/ubuntu/Dockerfile | 17 ++++++++++------- 2 files changed, 11 insertions(+), 8 deletions(-) diff --git a/docker/arch/Dockerfile b/docker/arch/Dockerfile index 4478ab08..50b1c0c8 100644 --- a/docker/arch/Dockerfile +++ b/docker/arch/Dockerfile @@ -1,6 +1,6 @@ FROM archlinux:base-20210307.0.16708 -RUN pacman -Syu --noconfirm && pacman -S wget sudo cmake make git gcc jsoncpp postgresql mariadb-clients --noconfirm +RUN pacman -Syu --noconfirm && pacman -S wget sudo cmake make git gcc jsoncpp postgresql mariadb-clients hiredis --noconfirm ENV LANG=en_US.UTF-8 \ LANGUAGE=en_US:en \ diff --git a/docker/ubuntu/Dockerfile b/docker/ubuntu/Dockerfile index e1e55a55..c0704914 100644 --- a/docker/ubuntu/Dockerfile +++ b/docker/ubuntu/Dockerfile @@ -1,20 +1,23 @@ -FROM ubuntu:18.04 +FROM ubuntu:20.04 + +ENV TZ=UTC +RUN ln -snf /usr/share/zoneinfo/$TZ /etc/localtime && echo $TZ > /etc/timezone RUN apt-get update -yqq \ && apt-get install -yqq --no-install-recommends software-properties-common \ - sudo curl wget cmake pkg-config locales git gcc-8 g++-8 \ + sudo curl wget cmake pkg-config locales git gcc-10 g++-10 \ openssl libssl-dev libjsoncpp-dev uuid-dev zlib1g-dev libc-ares-dev\ - postgresql-server-dev-all libmariadbclient-dev libsqlite3-dev \ + postgresql-server-dev-all libmariadbclient-dev libsqlite3-dev libhiredis-dev\ && rm -rf /var/lib/apt/lists/* \ && locale-gen en_US.UTF-8 ENV LANG=en_US.UTF-8 \ LANGUAGE=en_US:en \ LC_ALL=en_US.UTF-8 \ - CC=gcc-8 \ - CXX=g++-8 \ - AR=gcc-ar-8 \ - RANLIB=gcc-ranlib-8 \ + CC=gcc-10 \ + CXX=g++-10 \ + AR=gcc-ar-10 \ + RANLIB=gcc-ranlib-10 \ IROOT=/install ENV DROGON_ROOT="$IROOT/drogon"