Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update to Ubuntu 20.04 #1635

Merged
merged 14 commits into from
Oct 16, 2020
Merged

Update to Ubuntu 20.04 #1635

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
8ac8411
Updated Dockerfile and installer to Ubuntu 20.04
Sep 14, 2020
334652c
Gcc5 for ubuntu 16
Sep 17, 2020
854c7cd
Merge branch 'master' of https://github.com/lynckia/licode
Sep 17, 2020
e6b277f
Increased sleep after rabitmq
Sep 17, 2020
77ad46c
Readded cpplint file and python2 for tests
Sep 18, 2020
7e58bf3
Added route to libraries to bashrc
Sep 21, 2020
c2c3b98
Force v8 promise resolving to publish/subscriber faster (#1633)
jcague Sep 21, 2020
4b01584
Add more detail to unhandled promises error log (#1634)
lodoyun Sep 21, 2020
e898774
Fix problems with logs (#1626)
lodoyun Sep 21, 2020
3c34815
Correctly added libraries routes
Sep 21, 2020
f253be6
Fix: Removed unnecessary sleep
Sep 22, 2020
6eaeefc
Fix: Removed leftovers calls to cpplint.py
Sep 22, 2020
29677e8
Merge branch 'master' of https://www.github.com/Arri98/licode
Oct 2, 2020
b461a85
Package rollback and small changes in script
Oct 2, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 6 additions & 1 deletion Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,12 @@
FROM ubuntu:16.04
FROM ubuntu:20.04
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

👏


MAINTAINER Lynckia

WORKDIR /opt

#Configure tzdata
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
#Configure tzdata
# Configure tzdata

ENV TZ=Europe/Madrid
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

why do we need to set the timezone here?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

With Ubuntu 20, when running apt-get update the library tzdata will install and stop the docker build to ask the user for their timezone. The problem is that even when the user introduces the timezone, docker build gets stuck so I had to set the timezone before.

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
Expand All @@ -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
Expand Down
2 changes: 1 addition & 1 deletion erizo/src/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
)
Expand Down
Loading