correct frpc build ci.
All checks were successful
Deploy Docker Images / Docusaurus build and Server deploy (push) Successful in 20s

This commit is contained in:
amass 2024-10-17 23:38:50 +08:00
parent 736ed5570c
commit 9c2dd8bf01
3 changed files with 4 additions and 2 deletions

View File

@ -27,4 +27,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 frp-by1.wwvvww.cn:45288/frpc:0.60.0 .
# docker build --progress=tty -f frpc.dockerfile -t registry.cn-shenzhen.aliyuncs.com/amass_toolset/frpc:0.60.0 .

View File

@ -20,7 +20,7 @@ function build() {
docker build --progress=plain -f $DOCKERFILE -t registry.cn-shenzhen.aliyuncs.com/amass_toolset/ubuntu_dev:16.04 .
docker push registry.cn-shenzhen.aliyuncs.com/amass_toolset/ubuntu_dev:16.04
elif [[ $DOCKERFILE == *"frpc.dockerfile" ]]; then
FRP_VERSION=$(grep 'ENV FRP_VERSION' frpc.dockerfile | awk '{print $3}')
FRP_VERSION=$(grep 'ENV FRP_VERSION' $DOCKERFILE | awk '{print $3}')
docker build --progress=plain -f $DOCKERFILE -t registry.cn-shenzhen.aliyuncs.com/amass_toolset/frpc:$FRP_VERSION .
docker push registry.cn-shenzhen.aliyuncs.com/amass_toolset/frpc:$FRP_VERSION
else

View File

@ -26,3 +26,5 @@ RUN cd /root \
&& rm -rf frp_${FRP_VERSION}_linux_amd64/
ENTRYPOINT if [ -d /app ]; then cd /app && openresty -p /app; fi; /usr/bin/frpc -c /etc/frp/frpc.ini
# docker build --progress=tty -f wwooww_frpc.dockerfile -t registry.cn-shenzhen.aliyuncs.com/amass_toolset/frpc:0.49.0 .