diff --git a/Makefile b/Makefile index a1c3c961e8..5544413add 100644 --- a/Makefile +++ b/Makefile @@ -917,12 +917,11 @@ generate-manpage: ## generate manpage .PHONY: devstar devstar: + docker build -t devstar.cn/devstar/webterminal:latest -f docker/Dockerfile.webTerminal . docker build -t devstar-studio:latest -f docker/Dockerfile.devstar . .PHONY: docker docker: - docker build -t devstar.cn/devstar/webterminal:latest -f docker/Dockerfile.webTerminal . - docker build --disable-content-trust=false -t $(DOCKER_REF) . # support also build args docker build --build-arg GITEA_VERSION=v1.2.3 --build-arg TAGS="bindata sqlite sqlite_unlock_notify" . diff --git a/docker/Dockerfile.webTerminal b/docker/Dockerfile.webTerminal index a4a8f08432..84626dc118 100644 --- a/docker/Dockerfile.webTerminal +++ b/docker/Dockerfile.webTerminal @@ -9,6 +9,7 @@ RUN apt-get update && \ libjson-c-dev \ libwebsockets-dev +ARG CACHE_BUST=1 # ← 缓存从这里开始失效 RUN git clone https://devstar.cn/devstar/webTerminal.git /home/webTerminal # 设置工作目录并构建 WORKDIR /home/webTerminal/build diff --git a/public/assets/install.sh b/public/assets/install.sh index 9ab3e480fd..ae0fe411e9 100755 --- a/public/assets/install.sh +++ b/public/assets/install.sh @@ -86,12 +86,12 @@ function install { sudo docker pull devstar.cn/devstar/$IMAGE_NAME:$VERSION IMAGE_REGISTRY_USER=devstar.cn/devstar fi - if sudo docker pull devstar.cn/devstar/webterminal:latest; then - success "Successfully pulled devstar.cn/devstar/webterminal:latest" - else - sudo docker pull mengning997/webterminal:latest - success "Successfully pulled mengning997/webterminal:latest renamed to devstar.cn/devstar/webterminal:latest" + if sudo docker pull mengning997/webterminal:latest; then sudo docker tag mengning997/webterminal:latest devstar.cn/devstar/webterminal:latest + success "Successfully pulled mengning997/webterminal:latest renamed to devstar.cn/devstar/webterminal:latest" + else + sudo docker pull devstar.cn/devstar/webterminal:latest + success "Successfully pulled devstar.cn/devstar/webterminal:latest" fi } @@ -137,7 +137,10 @@ function stop { fi if [ $(docker ps -a --filter "name=^/devstar-studio$" -q | wc -l) -gt 0 ]; then sudo docker stop devstar-studio && sudo docker rm -f devstar-studio - fi + fi + if [ $(docker ps -a --filter "name=^/webterminal-" -q | wc -l) -gt 0 ]; then + sudo docker stop $(docker ps -a --filter "name=^/webterminal-" -q) && sudo docker rm -f $(docker ps -a --filter "name=^/webterminal-" -q) + fi } # Function to logs diff --git a/services/devcontainer/docker_agent.go b/services/devcontainer/docker_agent.go index c1215b8196..058ff3e701 100644 --- a/services/devcontainer/docker_agent.go +++ b/services/devcontainer/docker_agent.go @@ -598,7 +598,7 @@ func RegistWebTerminal(ctx context.Context) error { // 拉取镜像 err = docker_module.PullImage(ctx, cli, dockerHost, setting.DevContainerConfig.Web_Terminal_Image) if err != nil { - return fmt.Errorf("拉取web_terminal镜像失败:%v", err) + fmt.Errorf("拉取web_terminal镜像失败:%v", err) } timestamp := time.Now().Format("20060102150405")