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

change docker registy.

Browse Source
This commit is contained in:
amass 2024-10-09 22:43:23 +08:00
parent 0a5966bed7
commit e3bbfcb3c3
5 changed files with 45 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.gitea/workflows/deploy.yaml
View File

@ -25,7 +25,7 @@ jobs:
- name: Log in to Docker Registry - name: Log in to Docker Registry
uses: docker/login-action@v2 uses: docker/login-action@v2
with: with:
registry: frp-by1.wwvvww.cn:45288 registry: registry.cn-shenzhen.aliyuncs.com
username: ${{ secrets.DOCKER_USERNAME }} username: ${{ secrets.DOCKER_USERNAME }}
password: ${{ secrets.DOCKER_PASSWORD }} password: ${{ secrets.DOCKER_PASSWORD }}
- name: Build docker image and deploy. - name: Build docker image and deploy.

24
resources/build.sh
View File

@ -4,24 +4,24 @@ function build() {
local DOCKERFILE=$1 local DOCKERFILE=$1
echo "build $DOCKERFILE" echo "build $DOCKERFILE"
if [[ $DOCKERFILE == *"act_runner.dockerfile" ]]; then if [[ $DOCKERFILE == *"act_runner.dockerfile" ]]; then
docker build -f $DOCKERFILE -t frp-by1.wwvvww.cn:45288/act_runner:0.2.10 . docker build -f $DOCKERFILE -t registry.cn-shenzhen.aliyuncs.com/amass_toolset/act_runner:0.2.10 .
docker push frp-by1.wwvvww.cn:45288/act_runner:0.2.10 docker push registry.cn-shenzhen.aliyuncs.com/amass_toolset/act_runner:0.2.10
elif [[ $DOCKERFILE == *"nanopb.dockerfile" ]]; then elif [[ $DOCKERFILE == *"nanopb.dockerfile" ]]; then
docker build -f $DOCKERFILE -t frp-by1.wwvvww.cn:45288/nanopb:0.3.9.3 . docker build -f $DOCKERFILE -t registry.cn-shenzhen.aliyuncs.com/amass_toolset/nanopb:0.3.9.3 .
docker push frp-by1.wwvvww.cn:45288/nanopb:0.3.9.3 docker push registry.cn-shenzhen.aliyuncs.com/amass_toolset/nanopb:0.3.9.3
elif [[ $DOCKERFILE == *"ubuntu2404.dockerfile" ]]; then elif [[ $DOCKERFILE == *"ubuntu2404.dockerfile" ]]; then
docker build -f $DOCKERFILE -t frp-by1.wwvvww.cn:45288/ubuntu_dev:24.04 . docker build -f $DOCKERFILE -t registry.cn-shenzhen.aliyuncs.com/amass_toolset/ubuntu_dev:24.04 .
docker push frp-by1.wwvvww.cn:45288/ubuntu_dev:24.04 docker push registry.cn-shenzhen.aliyuncs.com/amass_toolset/ubuntu_dev:24.04
elif [[ $DOCKERFILE == *"ubuntu2204.dockerfile" ]]; then elif [[ $DOCKERFILE == *"ubuntu2204.dockerfile" ]]; then
docker build -f $DOCKERFILE -t frp-by1.wwvvww.cn:45288/ubuntu_dev:22.04 . docker build -f $DOCKERFILE -t registry.cn-shenzhen.aliyuncs.com/amass_toolset/ubuntu_dev:22.04 .
docker push frp-by1.wwvvww.cn:45288/ubuntu_dev:22.04 docker push registry.cn-shenzhen.aliyuncs.com/amass_toolset/ubuntu_dev:22.04
elif [[ $DOCKERFILE == *"ubuntu1604.dockerfile" ]]; then elif [[ $DOCKERFILE == *"ubuntu1604.dockerfile" ]]; then
docker build -f $DOCKERFILE -t frp-by1.wwvvww.cn:45288/ubuntu_dev:16.04 . docker build -f $DOCKERFILE -t registry.cn-shenzhen.aliyuncs.com/amass_toolset/ubuntu_dev:16.04 .
docker push frp-by1.wwvvww.cn:45288/ubuntu_dev:16.04 docker push registry.cn-shenzhen.aliyuncs.com/amass_toolset/ubuntu_dev:16.04
elif [[ $DOCKERFILE == *"frpc.dockerfile" ]]; then elif [[ $DOCKERFILE == *"frpc.dockerfile" ]]; then
FRP_VERSION=$(grep 'ENV FRP_VERSION' frpc.dockerfile | awk '{print $3}') FRP_VERSION=$(grep 'ENV FRP_VERSION' frpc.dockerfile | awk '{print $3}')
docker build -f $DOCKERFILE -t frp-by1.wwvvww.cn:45288/frpc:$FRP_VERSION . docker build -f $DOCKERFILE -t registry.cn-shenzhen.aliyuncs.com/amass_toolset/frpc:$FRP_VERSION .
docker push frp-by1.wwvvww.cn:45288/frpc:$FRP_VERSION docker push registry.cn-shenzhen.aliyuncs.com/amass_toolset/frpc:$FRP_VERSION
else else
echo "not found steps for build $DOCKERFILE ..." echo "not found steps for build $DOCKERFILE ..."
fi fi

3
ubuntu2204.dockerfile
View File

@ -31,9 +31,6 @@ RUN mkdir /var/run/sshd \
EXPOSE 1022 EXPOSE 1022
RUN git config --global user.email "168062547@qq.com" \
&& git config --global user.name "amass"
RUN cd /root \ RUN cd /root \
&& wget https://frp-by1.wwvvww.cn:44048/s/boost_1_86_0/download -O boost_1_86_0.tar.gz \ && wget https://frp-by1.wwvvww.cn:44048/s/boost_1_86_0/download -O boost_1_86_0.tar.gz \
&& tar xvf boost_1_86_0.tar.gz > /dev/null \ && tar xvf boost_1_86_0.tar.gz > /dev/null \

19
ubuntu2404.dockerfile
View File

@ -43,21 +43,18 @@ RUN mkdir /var/run/sshd \
EXPOSE 1022 EXPOSE 1022
RUN git config --global user.email "168062547@qq.com" \
&& git config --global user.name "amass"
RUN cd /root \ RUN cd /root \
&& apt install -y libgl1-mesa-dev libfontconfig1-dev libfreetype-dev libx11-dev libx11-xcb-dev libxext-dev libxfixes-dev libxi-dev libxrender-dev libxcb1-dev libxcb-cursor-dev libxcb-glx0-dev libxcb-keysyms1-dev libxcb-image0-dev libxcb-shm0-dev libxcb-icccm4-dev libxcb-sync-dev libxcb-xfixes0-dev libxcb-shape0-dev libxcb-randr0-dev libxcb-render-util0-dev libxcb-util-dev libxcb-xinerama0-dev libxcb-xkb-dev libxkbcommon-dev libxkbcommon-x11-dev \ && apt install -y libgl1-mesa-dev libfontconfig1-dev libfreetype-dev libx11-dev libx11-xcb-dev libxext-dev libxfixes-dev libxi-dev libxrender-dev libxcb1-dev libxcb-cursor-dev libxcb-glx0-dev libxcb-keysyms1-dev libxcb-image0-dev libxcb-shm0-dev libxcb-icccm4-dev libxcb-sync-dev libxcb-xfixes0-dev libxcb-shape0-dev libxcb-randr0-dev libxcb-render-util0-dev libxcb-util-dev libxcb-xinerama0-dev libxcb-xkb-dev libxkbcommon-dev libxkbcommon-x11-dev \
&& apt install -y libavcodec-dev libavformat-dev libavutil-dev libswscale-dev libavfilter-dev libavdevice-dev \ && apt install -y libavcodec-dev libavformat-dev libavutil-dev libswscale-dev libavfilter-dev libavdevice-dev \
&& wget https://download.qt.io/official_releases/qt/6.7/6.7.3/single/qt-everywhere-src-6.7.3.tar.xz \ && wget https://download.qt.io/official_releases/qt/6.8/6.8.0/single/qt-everywhere-src-6.8.0.tar.xz \
&& tar -xvf qt-everywhere-src-6.7.3.tar.xz \ && tar -xvf qt-everywhere-src-6.8.0.tar.xz \
&& cd ./qt-everywhere-src-6.7.3 \ && cd ./qt-everywhere-src-6.8.0 \
&& ./configure -prefix /opt/Qt/6.7.3/gcc_64 -opensource -debug-and-release -confirm-license -nomake examples -nomake tests -skip qtwebengine -skip qtcoap -skip qtopcua \ && ./configure -prefix /opt/Qt/6.8.0/gcc_64 -opensource -debug-and-release -confirm-license -nomake examples -nomake tests -skip qtwebengine -skip qtcoap -skip qtopcua \
&& cmake --build . --parallel \ && cmake --build . --parallel \
&& ninja install \ && ninja install \
&& rm -fr /root/qt-everywhere-src-6.7.3* \ && rm -fr /root/qt-everywhere-src-6.8.0* \
&& echo 'export PATH=/opt/Qt/6.7.3/gcc_64/bin:$PATH' >> /etc/zsh/zshenv \ && echo 'export PATH=/opt/Qt/6.8.0/gcc_64/bin:$PATH' >> /etc/zsh/zshenv \
&& echo 'export PATH=/opt/Qt/6.7.3/gcc_64/bin:$PATH' >> /etc/profile && echo 'export PATH=/opt/Qt/6.8.0/gcc_64/bin:$PATH' >> /etc/profile
RUN cd /root \ RUN cd /root \
&& wget https://frp-by1.wwvvww.cn:44048/s/boost_1_86_0/download -O boost_1_86_0.tar.gz \ && wget https://frp-by1.wwvvww.cn:44048/s/boost_1_86_0/download -O boost_1_86_0.tar.gz \
@ -80,7 +77,7 @@ RUN cd /root \
&& echo 'export LD_LIBRARY_PATH=/opt/Libraries/ZLMediaKit/lib:$LD_LIBRARY_PATH' >> /etc/profile \ && echo 'export LD_LIBRARY_PATH=/opt/Libraries/ZLMediaKit/lib:$LD_LIBRARY_PATH' >> /etc/profile \
&& rm -fr /root/ZLMediaKit && rm -fr /root/ZLMediaKit
ENV LD_LIBRARY_PATH=/opt/Libraries/boost_1_86_0/lib:/opt/Libraries/ZLMediaKit/lib:/opt/Qt/6.7.3/gcc_64/lib ENV LD_LIBRARY_PATH=/opt/Libraries/boost_1_86_0/lib:/opt/Libraries/ZLMediaKit/lib:/opt/Qt/6.8.0/gcc_64/lib
ENV LANG=C.UTF-8 ENV LANG=C.UTF-8
ENV LC_ALL=C.UTF-8 ENV LC_ALL=C.UTF-8

24
yoctools.dockerfile Normal file
View File

@ -0,0 +1,24 @@
FROM ubuntu:22.04
LABEL maintainer="amass <168062547@qq.com>"
ENV DEBIAN_FRONTEND=noninteractive
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 \
&& apt update \
&& apt install -y git lz4 unzip python3-pip
RUN pip3 install yoctools pyyaml && cd /usr/bin && ln -s python3 python
RUN git config --global core.quotepath false \
&& git config --global user.email "168062547@qq.com" \
&& git config --global user.name "amass"
CMD ["service", "ssh", "start", "-D"]
ENV LANG=C.UTF-8
ENV LC_ALL=C.UTF-8
ENV TERM=xterm-256color
# docker build --progress=tty -f yoctools.dockerfile -t registry.cn-shenzhen.aliyuncs.com/amass_toolset/yoctools:22.04 .