From 100deaddab6fa5d075f20e248a064923ae35fb15 Mon Sep 17 00:00:00 2001 From: amass <168062547@qq.com> Date: Wed, 25 Jun 2025 23:21:09 +0800 Subject: [PATCH] update version. --- frpc.dockerfile | 4 ++-- ubuntu2404-docker.dockerfile | 2 +- ubuntu2404-qt6-user.dockerfile | 3 ++- ubuntu2404.dockerfile | 15 ++++++++------- 4 files changed, 13 insertions(+), 11 deletions(-) diff --git a/frpc.dockerfile b/frpc.dockerfile index a236356..4d6ac33 100644 --- a/frpc.dockerfile +++ b/frpc.dockerfile @@ -2,7 +2,7 @@ FROM amd64/alpine:3.18 LABEL maintainer="amass <168062547@qq.com>" -ENV FRP_VERSION=0.62.1 +ENV FRP_VERSION=0.63.0 RUN apk add openssl curl ca-certificates \ && wget 'http://openresty.org/package/admin@openresty.com-5ea678a6.rsa.pub' \ @@ -26,4 +26,4 @@ RUN cd /root \ ENTRYPOINT if [ -d /app ]; then cd /app && openresty -p /app; fi; /usr/bin/frpc -c /etc/frp/frpc.toml -# docker build --progress=tty -f frpc.dockerfile -t registry.cn-shenzhen.aliyuncs.com/amass_toolset/frpc:0.62.1 . \ No newline at end of file +# docker build --progress=tty -f frpc.dockerfile -t registry.cn-shenzhen.aliyuncs.com/amass_toolset/frpc:0.63.0 . \ No newline at end of file diff --git a/ubuntu2404-docker.dockerfile b/ubuntu2404-docker.dockerfile index 9ee8cf1..66451d7 100644 --- a/ubuntu2404-docker.dockerfile +++ b/ubuntu2404-docker.dockerfile @@ -1,7 +1,7 @@ FROM registry.cn-shenzhen.aliyuncs.com/amass_toolset/ubuntu_dev:24.04-qt6.9.1 RUN apt-get update \ - && apt-get install docker-ce containerd.io docker-buildx-plugin docker-compose-plugin + && apt-get install -y docker-ce containerd.io docker-buildx-plugin docker-compose-plugin \ && apt clean \ && rm -fr /var/lib/apt/lists/* /tmp/* /var/tmp/* diff --git a/ubuntu2404-qt6-user.dockerfile b/ubuntu2404-qt6-user.dockerfile index 113974c..3cff78d 100644 --- a/ubuntu2404-qt6-user.dockerfile +++ b/ubuntu2404-qt6-user.dockerfile @@ -41,4 +41,5 @@ RUN sh -c "$(curl -fsSL https://raw.githubusercontent.com/ohmyzsh/ohmyzsh/master USER root CMD ["bash", "-c", "service ssh start && gosu amass code-server --bind-addr 0.0.0.0:8087"] -# docker build --no-cache --progress=tty -f ubuntu2404-qt6-user.dockerfile -t registry.cn-shenzhen.aliyuncs.com/amass_toolset/ubuntu_dev:24.04-qt6.9.1-user . \ No newline at end of file +# docker build --no-cache --progress=tty -f ubuntu2404-qt6-user.dockerfile -t registry.cn-shenzhen.aliyuncs.com/amass_toolset/ubuntu_dev:24.04-qt6.9.1-user . +# docker push registry.cn-shenzhen.aliyuncs.com/amass_toolset/ubuntu_dev:24.04-qt6.9.1-user \ No newline at end of file diff --git a/ubuntu2404.dockerfile b/ubuntu2404.dockerfile index 62a7685..33834ae 100644 --- a/ubuntu2404.dockerfile +++ b/ubuntu2404.dockerfile @@ -3,12 +3,13 @@ LABEL maintainer="amass <168062547@qq.com>" ENV DEBIAN_FRONTEND=noninteractive ENV BOOST_VERSION=1_88_0 -ENV CODE_VERSION=4.100.3 -ENV LIBDATACHANNEL_VERSION=0.22.6 +ENV CODE_VERSION=4.101.1 +ENV LIBDATACHANNEL_VERSION=0.23.0 ENV NNG_VERSION=1.11 ENV MBEDTLS_VERSION=3.6.3.1 ENV TCPING_VERSION=2.7.1 ENV COTURN_VERSION=4.7.0 +ENV LIBJPEG_TURBO_VERSION=3.1.1 RUN sed -i 's@//.*archive.ubuntu.com@//mirrors.ustc.edu.cn@g' /etc/apt/sources.list.d/ubuntu.sources \ && apt update \ @@ -79,13 +80,13 @@ RUN cd /root \ && rm -fr /root/libdatachannel RUN cd /root \ - && wget https://github.com/libjpeg-turbo/libjpeg-turbo/releases/download/3.1.0/libjpeg-turbo-3.1.0.tar.gz \ - && tar xvf libjpeg-turbo-3.1.0.tar.gz \ - && cd /root/libjpeg-turbo-3.1.0 \ - && cmake -G Ninja -B build -S . -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=/opt/Libraries/libjpeg-turbo-3.1.0 -DENABLE_SHARED=OFF \ + && wget https://github.com/libjpeg-turbo/libjpeg-turbo/releases/download/${LIBJPEG_TURBO_VERSION}/libjpeg-turbo-${LIBJPEG_TURBO_VERSION}.tar.gz \ + && tar xvf libjpeg-turbo-${LIBJPEG_TURBO_VERSION}.tar.gz \ + && cd /root/libjpeg-turbo-${LIBJPEG_TURBO_VERSION} \ + && cmake -G Ninja -B build -S . -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=/opt/Libraries/libjpeg-turbo-${LIBJPEG_TURBO_VERSION} -DENABLE_SHARED=OFF \ && cmake --build build --target all \ && cmake --install build \ - && rm -fr /root/libjpeg-turbo-3.1.0* + && rm -fr /root/libjpeg-turbo-${LIBJPEG_TURBO_VERSION}* RUN wget https://github.com/pouriyajamshidi/tcping/releases/download/v${TCPING_VERSION}/tcping-linux-amd64-static.tar.gz -O /tmp/tcping-linux-amd64-static.tar.gz \ && tar -xzf /tmp/tcping-linux-amd64-static.tar.gz -C /usr/bin \