Skip to content

Commit 9af2c47

Browse files
committed
Sync from khs1994-docker/lnmp@4f2ab4a by PCIT
1 parent d73c0f8 commit 9af2c47

File tree

5 files changed

+15
-7
lines changed

5 files changed

+15
-7
lines changed

.cnb.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,4 +18,4 @@ main:
1818
SOURCE_DOCKER_USERNAME:
1919
SOURCE_DOCKER_PASSWORD:
2020
SOURCE_DOCKER_REGISTRY:
21-
CONFIG_URL: https://gitee.com/khs1994-docker/lnmp/raw/23.11/dockerfile/sync/docker-image-sync.json
21+
CONFIG_URL: https://gitee.com/khs1994-docker/lnmp/raw/24.11/dockerfile/sync/docker-image-sync.json

Dockerfile

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@ ARG DEST_DOCKER_USERNAME
99
ARG DEST_DOCKER_PASSWORD
1010
ARG DEST_NAMESPACE
1111
# fix me 必须替换为自己的配置文件
12-
# ARG CONFIG_URL=https://gitee.com/khs1994-docker/lnmp/raw/23.11/dockerfile/sync/docker-image-sync-by-docker.json
13-
ARG CONFIG_URL=https://github.com/khs1994-docker/lnmp/raw/23.11/dockerfile/sync/docker-image-sync-by-docker.json
12+
# ARG CONFIG_URL=https://gitee.com/khs1994-docker/lnmp/raw/24.11/dockerfile/sync/docker-image-sync-by-docker.json
13+
ARG CONFIG_URL=https://github.com/khs1994-docker/lnmp/raw/24.11/dockerfile/sync/docker-image-sync-by-docker.json
1414

1515
# ARG SOURCE_DOCKER_REGISTRY=registry-1.docker.io
1616
# ARG SOURCE_DOCKER_REGISTRY=hub-mirror.c.163.com
@@ -21,7 +21,7 @@ ENV DEST_DOCKER_USERNAME=$DEST_DOCKER_USERNAME
2121
ENV DEST_DOCKER_PASSWORD=$DEST_DOCKER_PASSWORD
2222
ENV DEST_NAMESPACE=$DEST_NAMESPACE
2323
# ENV CONFIG_URL=$CONFIG_URL
24-
ENV CONFIG_URL=https://github.com/khs1994-docker/lnmp/raw/23.11/dockerfile/sync/docker-image-sync-by-docker.json
24+
ENV CONFIG_URL=https://github.com/khs1994-docker/lnmp/raw/24.11/dockerfile/sync/docker-image-sync-by-docker.json
2525

2626
# ENV SOURCE_DOCKER_REGISTRY=$SOURCE_DOCKER_REGISTRY
2727
# 更多环境变量请查看 https://github.com/khs1994-docker/lnmp/blob/master/windows/docker-image-sync.Dockerfile

Jenkinsfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ pipeline {
7474

7575
stage('同步镜像') {
7676
steps {
77-
sh "curl -L -O https://gitee.com/khs1994-docker/lnmp/raw/23.11/dockerfile/sync/docker-image-sync.json"
77+
sh "curl -L -O https://gitee.com/khs1994-docker/lnmp/raw/24.11/dockerfile/sync/docker-image-sync.json"
7878

7979
sh '''
8080
docker run -i --rm \
@@ -86,7 +86,7 @@ pipeline {
8686
-e DEST_DOCKER_REGISTRY=\${DEST_DOCKER_REGISTRY} \
8787
-e DEST_NAMESPACE=\${REGISTRY_NAMESPACE} \
8888
-e CI=true \
89-
-e CONFIG_URL=https://gitee.com/khs1994-docker/lnmp/raw/23.11/dockerfile/sync/docker-image-sync.json \
89+
-e CONFIG_URL=https://gitee.com/khs1994-docker/lnmp/raw/24.11/dockerfile/sync/docker-image-sync.json \
9090
-v \$PWD/docker-image-sync.json:/docker-entrypoint.d/docker-image-sync.json \
9191
docker.cnb.cool/khs1994-docker/khs1994/docker-image-sync
9292
'''

docker-image-sync-ghcr.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@
4040
"dest": "docker-dockerfile"
4141
},
4242
{
43-
"source": "docker/dockerfile:labs",
43+
"source": "docker/dockerfile-upstream:master",
4444
"dest": "docker-dockerfile:labs"
4545
},
4646
{

docker-image-sync.json

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -342,6 +342,14 @@
342342
"source": "library/php:8.3.12-fpm-alpine",
343343
"dest": "library-mirror/php:8.3.12-fpm-alpine"
344344
},
345+
{
346+
"source": "library/php:8.3.12-cli-alpine",
347+
"dest": "library-mirror/php:8.3.12-cli-alpine"
348+
},
349+
{
350+
"source": "library/php:8.3.12-zts-alpine",
351+
"dest": "library-mirror/php:8.3.12-zts-alpine"
352+
},
345353
{
346354
"source": "calico/cni:v3.30.1",
347355
"dest": "library-mirror/calico-cni:v3.30.1"

0 commit comments

Comments
 (0)