Update to Ubuntu 20.04 (lynckia#1635)

davidguv · Oct 16, 2020 · 8a1eb05 · 8a1eb05
1 parent b0b99a5
commit 8a1eb05
Show file tree

Hide file tree

Showing 9 changed files with 45 additions and 6,166 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -1,9 +1,12 @@
-FROM ubuntu:16.04
+FROM ubuntu:20.04
 
 MAINTAINER Lynckia
 
 WORKDIR /opt
 
+#Configure tzdata
+ENV TZ=Europe/Madrid
+RUN ln -snf /usr/share/zoneinfo/$TZ /etc/localtime && echo $TZ > /etc/timezone
 
 # Download latest version of the code and install dependencies
 RUN  apt-get update && apt-get install -y git wget curl
@@ -29,6 +32,8 @@ RUN ./installErizo.sh -dfeacs && \
     ./../nuve/installNuve.sh && \
     ./installBasicExample.sh
 
+RUN ldconfig /opt/licode/build/libdeps/build/lib 
+
 WORKDIR /opt/licode
 
 ARG COMMIT

diff --git a/erizo/src/CMakeLists.txt b/erizo/src/CMakeLists.txt
@@ -49,7 +49,7 @@ set (ERIZO_TEST ${CMAKE_CURRENT_SOURCE_DIR}/test)
 
 file(GLOB_RECURSE ERIZO_SOURCES_FILES ${ERIZO_SOURCE}/*.cpp ${ERIZO_SOURCE}/*.h ${ERIZO_TEST}/*.cpp)
 add_custom_target(lint
-    ${ERIZO_ROOT_DIR}/utils/cpplint.py --filter=-legal/copyright,-build/include --linelength=120 ${ERIZO_SOURCES_FILES}
+    cpplint --filter=-legal/copyright,-build/include --linelength=120 ${ERIZO_SOURCES_FILES}
     WORKING_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}"
     COMMENT "Executing lint"
 )