Update build configuration and Dockerfile for improved build process and script management
This commit is contained in:
		
							parent
							
								
									e9b4d2c505
								
							
						
					
					
						commit
						6486a010bb
					
				
							
								
								
									
										5
									
								
								.cnb.yml
									
									
									
									
									
								
							
							
						
						
									
										5
									
								
								.cnb.yml
									
									
									
									
									
								
							| @ -18,6 +18,7 @@ $: | ||||
|           script: docker login -u "$DOCKER_USERNAME" -p "$DOCKER_PASSWD" | ||||
|         - name: docker build | ||||
|           script: docker build -t ${IMAGE_TAG} . | ||||
|           timeout: 3600s | ||||
|         - name: docker push | ||||
|           script: docker push ${IMAGE_TAG} | ||||
|         - name: resolve | ||||
| @ -45,7 +46,9 @@ $: | ||||
|           type: cnb:resolve | ||||
|           options: | ||||
|             key: build-arm64 | ||||
| 
 | ||||
|     - runner: | ||||
|         tags: cnb:arch:amd64 | ||||
|         cpus: 2 | ||||
|     - services: | ||||
|         - docker | ||||
|       imports: https://cnb.cool/btpanel/secret/-/blob/main/docker.yml | ||||
|  | ||||
| @ -16,11 +16,11 @@ RUN sed -i 's/deb.debian.org/mirrors.tencent.com/g' /etc/apt/sources.list \ | ||||
|     && rm -rf /var/lib/apt/lists/*  | ||||
| 
 | ||||
| # 复制脚本 | ||||
| COPY ["bt.sh", "init_mysql.sh", "mysql.sh", "/"] | ||||
| COPY ["phpmyadmin.sh","mysql.sh", "/lamp/"] | ||||
| COPY ["bt.sh", "init_mysql.sh", "/"] | ||||
| COPY ["phpmyadmin.sh", "/lamp/"] | ||||
| 
 | ||||
| # 转换启动脚本 | ||||
| RUN dos2unix /bt.sh && dos2unix /init_mysql.sh && dos2unix /lamp/phpmyadmin.sh && dos2unix /lamp/mysql.sh | ||||
| RUN dos2unix /bt.sh && dos2unix /init_mysql.sh | ||||
| 
 | ||||
| # 下载并安装宝塔面板及 lamp 环境 | ||||
| RUN curl -sSO https://download.bt.cn/install/install_panel.sh \ | ||||
| @ -28,8 +28,9 @@ RUN curl -sSO https://download.bt.cn/install/install_panel.sh \ | ||||
| 
 | ||||
| RUN curl -o /lamp/apache.sh https://download.bt.cn/install/0/apache.sh \ | ||||
|     && sh /lamp/apache.sh install 2.4 \  | ||||
|     && curl -o /lamp/php.sh https://download.bt.cn/install/3/php.sh \ | ||||
|     && curl -o /lamp/php.sh https://download.bt.cn/install/4/php.sh \ | ||||
|     && sh /lamp/php.sh install 8.3 \ | ||||
|     && curl -o /lamp/mysql.sh https://download.bt.cn/install/4/mysql.sh \ | ||||
|     && sh /lamp/mysql.sh install 8.0 \ | ||||
|     && sh /lamp/phpmyadmin.sh install 5.2 \ | ||||
|     && rm -rf /lamp \ | ||||
|  | ||||
		Loading…
	
	
			
			x
			
			
		
	
		Reference in New Issue
	
	Block a user
	 xiao
						xiao