amass/Older
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

update docker ubuntu2204.
Some checks failed
Deploy Docker Images / Build dockerfile and Server deploy (push) Failing after 44m6s
Details

Browse Source
This commit is contained in:
amass 2024-12-01 16:48:05 +08:00
parent 0be977eb3d
commit 9a9a797986
2 changed files with 10 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
Dockerfiles/ubuntu2204.dockerfile
View File

@ -8,7 +8,7 @@ ENV WT_VERSION=4.11.1
RUN sed -i "s@http://.*archive.ubuntu.com@http://mirrors.tuna.tsinghua.edu.cn@g" /etc/apt/sources.list \ RUN sed -i "s@http://.*archive.ubuntu.com@http://mirrors.tuna.tsinghua.edu.cn@g" /etc/apt/sources.list \
&& sed -i "s@http://.*security.ubuntu.com@http://mirrors.tuna.tsinghua.edu.cn@g" /etc/apt/sources.list \ && sed -i "s@http://.*security.ubuntu.com@http://mirrors.tuna.tsinghua.edu.cn@g" /etc/apt/sources.list \
&& apt update \ && apt update \
&& apt install -y cmake ninja-build pkg-config openssh-server git nano gpg ca-certificates \ && apt install -y gcc g++ gdb cmake ninja-build pkg-config openssh-server git nano gpg ca-certificates \
wget curl rsync lsb-release ubuntu-keyring gnupg2 bzip2 unzip zsh libssl-dev zlib1g-dev gettext jq htop tini \ wget curl rsync lsb-release ubuntu-keyring gnupg2 bzip2 unzip zsh libssl-dev zlib1g-dev gettext jq htop tini \
&& install -m 0755 -d /etc/apt/keyrings \ && install -m 0755 -d /etc/apt/keyrings \
&& curl -fsSL https://download.docker.com/linux/ubuntu/gpg -o /etc/apt/keyrings/docker.asc \ && curl -fsSL https://download.docker.com/linux/ubuntu/gpg -o /etc/apt/keyrings/docker.asc \
@ -49,18 +49,6 @@ RUN sh -c "$(curl -fsSL https://raw.githubusercontent.com/ohmyzsh/ohmyzsh/master
&& echo 'if [ -f /etc/profile ]; then source /etc/profile; fi' >> /etc/zsh/zprofile \ && echo 'if [ -f /etc/profile ]; then source /etc/profile; fi' >> /etc/zsh/zprofile \
&& chsh -s /bin/zsh root && chsh -s /bin/zsh root
RUN cd /root \
&& apt update \
&& apt install -y software-properties-common \
&& add-apt-repository -y ppa:ubuntu-toolchain-r/test \
&& apt install -y gcc-13 g++-13 gdb \
&& update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-13 60 \
&& update-alternatives --install /usr/bin/g++ g++ /usr/bin/g++-13 60 \
&& update-alternatives --config gcc \
&& update-alternatives --config g++ \
&& apt clean \
&& rm -fr /var/lib/apt/lists/* /tmp/* /var/tmp/*
RUN cd /opt \ RUN cd /opt \
&& git clone --depth=1 https://github.com/emscripten-core/emsdk.git \ && git clone --depth=1 https://github.com/emscripten-core/emsdk.git \
&& cd /opt/emsdk \ && cd /opt/emsdk \

10
resources/build.sh
View File

@ -79,7 +79,7 @@ function init() {
done done
} }
function build_docker_images(){ function build_docker_images() {
local DOCKERFILE=$1 local DOCKERFILE=$1
echo "build $DOCKERFILE" echo "build $DOCKERFILE"
if [[ $DOCKERFILE == *"act_runner.dockerfile" ]]; then if [[ $DOCKERFILE == *"act_runner.dockerfile" ]]; then
@ -110,14 +110,16 @@ function build_docker_images(){
fi fi
} }
function lvgl(){ function lvgl() {
rm ${build_path}/LvglApplication/lvglapp.html local lvgl_page="${build_path}/LvglApplication/lvglapp.html"
if [ -f "$lvgl_page" ]; then
rm "$lvgl_page"
fi
emcmake cmake -G Ninja -DSDL2_DIR=/home/amass/emsdk/upstream/emscripten/system/lib/cmake/SDL2 -S LvglApplication -B ${build_path}/LvglApplication emcmake cmake -G Ninja -DSDL2_DIR=/home/amass/emsdk/upstream/emscripten/system/lib/cmake/SDL2 -S LvglApplication -B ${build_path}/LvglApplication
cmake --build ${build_path}/LvglApplication --target all cmake --build ${build_path}/LvglApplication --target all
# python3 -m http.server -d ./build/LvglApplication # python3 -m http.server -d ./build/LvglApplication
} }
function main() { function main() {
local cmd=$1 local cmd=$1
shift 1 shift 1