update to ubuntu20 support lantern6.0

Author: wilon

Dockerfile

@@ -1,4 +1,4 @@
-FROM ubuntu:14.04
+FROM ubuntu:20.04
 MAINTAINER weilong <wilonx@163.com>
 WORKDIR /root
 RUN apt-get update  && \

Dockerfile-CN

@@ -1,24 +1,24 @@
-FROM daocloud.io/ubuntu:14.04
+FROM daocloud.io/ubuntu:20.04
 MAINTAINER weilong <wilonx@163.com>
 WORKDIR /root
 RUN sudo mv /etc/apt/sources.list /etc/apt/sources.list.bak && \
-        echo "deb http://mirrors.aliyun.com/ubuntu/ trusty main restricted universe multiverse" >> /etc/apt/sources.list && \
-        echo "deb http://mirrors.aliyun.com/ubuntu/ trusty-security main restricted universe multiverse" >> /etc/apt/sources.list && \
-        echo "deb http://mirrors.aliyun.com/ubuntu/ trusty-updates main restricted universe multiverse" >> /etc/apt/sources.list && \
-        echo "deb http://mirrors.aliyun.com/ubuntu/ trusty-proposed main restricted universe multiverse" >> /etc/apt/sources.list && \
-        echo "deb http://mirrors.aliyun.com/ubuntu/ trusty-backports main restricted universe multiverse" >> /etc/apt/sources.list && \
-        echo "deb-src http://mirrors.aliyun.com/ubuntu/ trusty main restricted universe multiverse" >> /etc/apt/sources.list && \
-        echo "deb-src http://mirrors.aliyun.com/ubuntu/ trusty-security main restricted universe multiverse" >> /etc/apt/sources.list && \
-        echo "deb-src http://mirrors.aliyun.com/ubuntu/ trusty-updates main restricted universe multiverse" >> /etc/apt/sources.list && \
-        echo "deb-src http://mirrors.aliyun.com/ubuntu/ trusty-proposed main restricted universe multiverse" >> /etc/apt/sources.list && \
-        echo "deb-src http://mirrors.aliyun.com/ubuntu/ trusty-backports main restricted universe multiverse" >> /etc/apt/sources.list && \
+        echo "deb http://mirrors.aliyun.com/ubuntu/ focal main restricted universe multiverse" >> /etc/apt/sources.list && \
+        echo "deb-src http://mirrors.aliyun.com/ubuntu/ focal main restricted universe multiverse" >> /etc/apt/sources.list && \
+        echo "deb http://mirrors.aliyun.com/ubuntu/ focal-security main restricted universe multiverse" >> /etc/apt/sources.list && \
+        echo "deb-src http://mirrors.aliyun.com/ubuntu/ focal-security main restricted universe multiverse" >> /etc/apt/sources.list && \
+        echo "deb http://mirrors.aliyun.com/ubuntu/ focal-updates main restricted universe multiverse" >> /etc/apt/sources.list && \
+        echo "deb-src http://mirrors.aliyun.com/ubuntu/ focal-updates main restricted universe multiverse" >> /etc/apt/sources.list && \
+        echo "deb http://mirrors.aliyun.com/ubuntu/ focal-proposed main restricted universe multiverse" >> /etc/apt/sources.list && \
+        echo "deb-src http://mirrors.aliyun.com/ubuntu/ focal-proposed main restricted universe multiverse" >> /etc/apt/sources.list && \
+        echo "deb http://mirrors.aliyun.com/ubuntu/ focal-backports main restricted universe multiverse" >> /etc/apt/sources.list && \
+        echo "deb-src http://mirrors.aliyun.com/ubuntu/ focal-backports main restricted universe multiverse" >> /etc/apt/sources.list && \
         apt-get update  && \
         apt-get -y install wget libappindicator3-1 && \
         git clone https://github.com/wilon/lantern.git && \
         dpkg -i ./lantern/binaries/lantern-installer-64-bit.deb && \
         apt-get -f install && \
         apt-get clean && \
-        rm -rf /var/cache/apt/* /var/lib/apt/lists/* && \
+        rm -rf ./lantern /var/cache/apt/* /var/lib/apt/lists/* && \
         mkdir /root/.lantern && \
         echo "localHTTPToken: wilonlantern" > /root/settings.yaml
 

README.MD

@@ -13,17 +13,20 @@ docker pull wilon/lantern
 
 或者源码构建，更适合国内网络：
 ```
-docker build -t wilon/lantern https://raw.githubusercontent.com/wilon/lantern/master/Dockerfile-CN
+git clone https://github.com/wilon/lantern.git
+cd ./lantern
+docker build -t wilon/lantern -f Dockerfile-CN .
 ```
 
 启动：
 ```
 docker run -itd --restart=always --name lantern -p 3128:3128 -p 8080:8080 wilon/lantern
 ```
 
-或者本地源码构建使用 docker-compose
+或者使用 docker-compose
 ```
 git clone https://github.com/wilon/lantern.git
+cd ./lantern
 docker-compose up -d
 ```
 ## 测试

docker-compose.yml

@@ -1,7 +1,7 @@
 version: "3"
 services:
   lantern:
-    build: .
+    image: wilon/lantern
     restart: always
     ports:
       - "3128:3128"