@@ -9,11 +9,16 @@ platform:
99steps :
1010- name : test
1111 commands :
12+ - mkdir -p $HOMEPATH/.docker; echo $IMAGE_PULL_SECRETS > $HOMEPATH/.docker/config.json
1213 - make test
1314 environment :
1415 VERSION : ${DRONE_TAG:-latest}-linux-amd64
15- DEV_REGISTRY : ${DEV_REGISTRY:-docker.io}
16- DRYCC_REGISTRY : ${DRYCC_REGISTRY:-docker.io}
16+ DEV_REGISTRY :
17+ from_secret : dev_registry
18+ DRYCC_REGISTRY :
19+ from_secret : drycc_registry
20+ IMAGE_PULL_SECRETS :
21+ from_secret : container_pull_secrets
1722 when :
1823 event :
1924 - push
@@ -22,18 +27,18 @@ steps:
2227
2328- name : publish
2429 commands :
25- - echo $DOCKER_PASSWORD | docker login $DRYCC_REGISTRY --username $DOCKER_USERNAME --password-stdin
30+ - echo $CONTAINER_PASSWORD | docker login $DRYCC_REGISTRY --username $CONTAINER_USERNAME --password-stdin > /dev/null 2>&1
2631 - make docker-build docker-immutable-push
2732 environment :
2833 VERSION : ${DRONE_TAG:-latest}-linux-amd64
2934 DEV_REGISTRY :
3035 from_secret : dev_registry
3136 DRYCC_REGISTRY :
3237 from_secret : drycc_registry
33- DOCKER_USERNAME :
34- from_secret : docker_username
35- DOCKER_PASSWORD :
36- from_secret : docker_password
38+ CONTAINER_USERNAME :
39+ from_secret : container_username
40+ CONTAINER_PASSWORD :
41+ from_secret : container_password
3742 when :
3843 event :
3944 - push
@@ -51,18 +56,18 @@ platform:
5156steps :
5257- name : publish
5358 commands :
54- - echo $DOCKER_PASSWORD | docker login $DRYCC_REGISTRY --username $DOCKER_USERNAME --password-stdin
59+ - echo $CONTAINER_PASSWORD | docker login $DRYCC_REGISTRY --username $CONTAINER_USERNAME --password-stdin > /dev/null 2>&1
5560 - make docker-build docker-immutable-push
5661 environment :
5762 VERSION : ${DRONE_TAG:-latest}-linux-arm64
5863 DEV_REGISTRY :
5964 from_secret : dev_registry
6065 DRYCC_REGISTRY :
6166 from_secret : drycc_registry
62- DOCKER_USERNAME :
63- from_secret : docker_username
64- DOCKER_PASSWORD :
65- from_secret : docker_password
67+ CONTAINER_USERNAME :
68+ from_secret : container_username
69+ CONTAINER_PASSWORD :
70+ from_secret : container_password
6671 when :
6772 event :
6873 - push
@@ -72,13 +77,15 @@ steps:
7277kind : pipeline
7378type : docker
7479name : manifest
80+ image_pull_secrets :
81+ - container_pull_secrets
7582
7683steps :
7784- name : generate manifest
78- image : docker.io/library/alpine
85+ image : registry.drycc.cc/drycc/python-dev
7986 pull : always
8087 commands :
81- - sed -i "s/docker.io /$${DRYCC_REGISTRY}/g" .drone/manifest.tmpl
88+ - sed -i "s/registry.drycc.cc /$${DRYCC_REGISTRY}/g" .drone/manifest.tmpl
8289 environment :
8390 DRYCC_REGISTRY :
8491 from_secret : drycc_registry
8895 settings :
8996 spec : .drone/manifest.tmpl
9097 username :
91- from_secret : docker_username
98+ from_secret : container_username
9299 password :
93- from_secret : docker_password
100+ from_secret : container_password
94101 environment :
95102 DEV_REGISTRY :
96103 from_secret : dev_registry
0 commit comments