lyon 3 лет назад
Родитель
Сommit
ea90b5676e
2 измененных файлов с 25 добавлено и 3 удалено
  1. 9 3
      docker/Dockerfile
  2. 16 0
      docker/ubuntu22_sources.list

+ 9 - 3
docker/Dockerfile

@@ -1,6 +1,9 @@
-FROM ubuntu:20.04
+FROM ubuntu:22.04
+
+ADD ubuntu22_sources.list /etc/apt/sources.list
+RUN touch /etc/apt/apt.conf.d/99verify-peer.conf \
+&& echo >>/etc/apt/apt.conf.d/99verify-peer.conf "Acquire { https::Verify-Peer false }"
 
-ADD ubuntu20_sources.list /etc/apt/sources.list
 
 RUN echo 'Asia/Shanghai' >/etc/timezone
 
@@ -51,16 +54,19 @@ RUN apt-get install -y \
     wine \
     cbindgen
 
-RUN dpkg --add-architecture i386 && apt-get update && apt-get install wine32 -y
+# only need on ubuntu20.04
+# RUN dpkg --add-architecture i386 && apt-get update && apt-get install wine32 -y
 
 RUN apt-get install -y golang
 RUN go env -w GO111MODULE=on
 RUN go env -w GOPROXY=https://goproxy.cn
 
 RUN git clone https://gitee.com/lyon1998/pikascript  root/pikascript
+RUN cd /root/pikascript && git pull
 
 ADD rust_config /root/.cargo/config
 RUN rustup target add i686-pc-windows-gnu
+RUN cd /root/pikascript/tools/pikaCompiler && sh build.sh
 
 
 

+ 16 - 0
docker/ubuntu22_sources.list

@@ -0,0 +1,16 @@
+# 默认注释了源码镜像以提高 apt update 速度,如有需要可自行取消注释
+deb https://mirrors.tuna.tsinghua.edu.cn/ubuntu/ jammy main restricted universe multiverse
+# deb-src https://mirrors.tuna.tsinghua.edu.cn/ubuntu/ jammy main restricted universe multiverse
+deb https://mirrors.tuna.tsinghua.edu.cn/ubuntu/ jammy-updates main restricted universe multiverse
+# deb-src https://mirrors.tuna.tsinghua.edu.cn/ubuntu/ jammy-updates main restricted universe multiverse
+deb https://mirrors.tuna.tsinghua.edu.cn/ubuntu/ jammy-backports main restricted universe multiverse
+# deb-src https://mirrors.tuna.tsinghua.edu.cn/ubuntu/ jammy-backports main restricted universe multiverse
+deb https://mirrors.tuna.tsinghua.edu.cn/ubuntu/ jammy-security main restricted universe multiverse
+# deb-src https://mirrors.tuna.tsinghua.edu.cn/ubuntu/ jammy-security main restricted universe multiverse
+
+# 预发布软件源,不建议启用
+# deb https://mirrors.tuna.tsinghua.edu.cn/ubuntu/ jammy-proposed main restricted universe multiverse
+# deb-src https://mirrors.tuna.tsinghua.edu.cn/ubuntu/ jammy-proposed main restricted universe multiverse
+
+
+deb https://repo.huaweicloud.com/ubuntu/ jammy main universe restricted multiverse