Skip to content

Commit f1935de

Browse files
duanhongyiduanhongyi
committed
chore(pack-images): use registry.drycc.cc replace docker.io
1 parent 04822c8 commit f1935de

6 files changed

Lines changed: 58 additions & 51 deletions

File tree

‎.drone/drone.yml‎

Lines changed: 47 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -9,12 +9,15 @@ platform:
99
steps:
1010
- name: test
1111
commands:
12+
- mkdir -p $HOMEPATH/.docker; echo $IMAGE_PULL_SECRETS > $HOMEPATH/.docker/config.json
1213
- STACK=20 make test-style
1314
environment:
1415
DEV_REGISTRY:
1516
from_secret: dev_registry
1617
DRYCC_REGISTRY:
1718
from_secret: drycc_registry
19+
IMAGE_PULL_SECRETS:
20+
from_secret: container_pull_secrets
1821
CODECOV_TOKEN:
1922
from_secret: codecov_token
2023
when:
@@ -25,17 +28,17 @@ steps:
2528

2629
- name: publish pack
2730
commands:
28-
- echo $DOCKER_PASSWORD | docker login $DRYCC_REGISTRY --username $DOCKER_USERNAME --password-stdin
31+
- echo $CONTAINER_PASSWORD | docker login $DRYCC_REGISTRY --username $CONTAINER_USERNAME --password-stdin > /dev/null 2>&1
2932
- CODENAME=bullseye make publish-pack
3033
environment:
3134
DEV_REGISTRY:
3235
from_secret: dev_registry
3336
DRYCC_REGISTRY:
3437
from_secret: drycc_registry
35-
DOCKER_USERNAME:
36-
from_secret: docker_username
37-
DOCKER_PASSWORD:
38-
from_secret: docker_password
38+
CONTAINER_USERNAME:
39+
from_secret: container_username
40+
CONTAINER_PASSWORD:
41+
from_secret: container_password
3942
when:
4043
event:
4144
- push
@@ -53,17 +56,17 @@ platform:
5356
steps:
5457
- name: publish pack
5558
commands:
56-
- 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
5760
- CODENAME=bullseye make publish-pack
5861
environment:
5962
DEV_REGISTRY:
6063
from_secret: dev_registry
6164
DRYCC_REGISTRY:
6265
from_secret: drycc_registry
63-
DOCKER_USERNAME:
64-
from_secret: docker_username
65-
DOCKER_PASSWORD:
66-
from_secret: docker_password
66+
CONTAINER_USERNAME:
67+
from_secret: container_username
68+
CONTAINER_PASSWORD:
69+
from_secret: container_password
6770

6871
trigger:
6972
event:
@@ -74,13 +77,15 @@ trigger:
7477
kind: pipeline
7578
type: docker
7679
name: manifest-pack
80+
image_pull_secrets:
81+
- container_pull_secrets
7782

7883
steps:
7984
- name: generate pack manifest
80-
image: docker.io/library/alpine
85+
image: registry.drycc.cc/drycc/python-dev
8186
commands:
82-
- sed -i "s/docker.io/$${DRYCC_REGISTRY}/g" .drone/manifest-run.tmpl
83-
- sed -i "s/docker.io/$${DRYCC_REGISTRY}/g" .drone/manifest-build.tmpl
87+
- sed -i "s/registry.drycc.cc/$${DRYCC_REGISTRY}/g" .drone/manifest-run.tmpl
88+
- sed -i "s/registry.drycc.cc/$${DRYCC_REGISTRY}/g" .drone/manifest-build.tmpl
8489
- sed -i "s/20/$${STACK}/g" .drone/manifest-run.tmpl
8590
- sed -i "s/20/$${STACK}/g" .drone/manifest-build.tmpl
8691
environment:
@@ -93,9 +98,9 @@ steps:
9398
settings:
9499
spec: .drone/manifest-run.tmpl
95100
username:
96-
from_secret: docker_username
101+
from_secret: container_username
97102
password:
98-
from_secret: docker_password
103+
from_secret: container_password
99104
environment:
100105
STACK: 20
101106
DEV_REGISTRY:
@@ -108,9 +113,9 @@ steps:
108113
settings:
109114
spec: .drone/manifest-build.tmpl
110115
username:
111-
from_secret: docker_username
116+
from_secret: container_username
112117
password:
113-
from_secret: docker_password
118+
from_secret: container_password
114119
environment:
115120
STACK: 20
116121
DEV_REGISTRY:
@@ -139,24 +144,24 @@ platform:
139144
steps:
140145
- name: publish amd64 buildpack
141146
commands:
142-
- echo $DOCKER_PASSWORD | docker login $DRYCC_REGISTRY --username $DOCKER_USERNAME --password-stdin
147+
- echo $CONTAINER_PASSWORD | docker login $DRYCC_REGISTRY --username $CONTAINER_USERNAME --password-stdin > /dev/null 2>&1
143148
- docker run --rm
149+
-v "/usr/local/bin:/tmp/bin"
144150
--env CODENAME=bullseye
145151
--env DRYCC_REGISTRY=$DRYCC_REGISTRY
146152
--entrypoint init-stack
147-
-v "$(pwd):$(pwd)"
148-
-w "$(pwd)"
149-
drycc/imagebuilder:canary
150-
install-packages make && make publish-buildpack
153+
$DRYCC_REGISTRY/drycc/imagebuilder:canary
154+
bash -c "cp /opt/drycc/pack/bin/pack /tmp/bin"
155+
- make publish-buildpack
151156
environment:
152157
DEV_REGISTRY:
153158
from_secret: dev_registry
154159
DRYCC_REGISTRY:
155160
from_secret: drycc_registry
156-
DOCKER_USERNAME:
157-
from_secret: docker_username
158-
DOCKER_PASSWORD:
159-
from_secret: docker_password
161+
CONTAINER_USERNAME:
162+
from_secret: container_username
163+
CONTAINER_PASSWORD:
164+
from_secret: container_password
160165
when:
161166
event:
162167
- push
@@ -177,24 +182,24 @@ platform:
177182
steps:
178183
- name: publish arm64 buildpack
179184
commands:
180-
- echo $DOCKER_PASSWORD | docker login $DRYCC_REGISTRY --username $DOCKER_USERNAME --password-stdin
185+
- echo $CONTAINER_PASSWORD | docker login $DRYCC_REGISTRY --username $CONTAINER_USERNAME --password-stdin > /dev/null 2>&1
181186
- docker run --rm
187+
-v "/usr/local/bin:/tmp/bin"
182188
--env CODENAME=bullseye
183189
--env DRYCC_REGISTRY=$DRYCC_REGISTRY
184190
--entrypoint init-stack
185-
-v "$(pwd):$(pwd)"
186-
-w "$(pwd)"
187-
drycc/imagebuilder:canary
188-
install-packages make && make publish-buildpack
191+
$DRYCC_REGISTRY/drycc/imagebuilder:canary
192+
bash -c "cp /opt/drycc/pack/bin/pack /tmp/bin"
193+
- make publish-buildpack
189194
environment:
190195
DEV_REGISTRY:
191196
from_secret: dev_registry
192197
DRYCC_REGISTRY:
193198
from_secret: drycc_registry
194-
DOCKER_USERNAME:
195-
from_secret: docker_username
196-
DOCKER_PASSWORD:
197-
from_secret: docker_password
199+
CONTAINER_USERNAME:
200+
from_secret: container_username
201+
CONTAINER_PASSWORD:
202+
from_secret: container_password
198203
when:
199204
event:
200205
- push
@@ -207,13 +212,15 @@ depends_on:
207212
kind: pipeline
208213
type: docker
209214
name: manifest-buildpacks
215+
image_pull_secrets:
216+
- container_pull_secrets
210217

211218
steps:
212219
- name: generate buildpacks manifest
213-
image: docker.io/library/alpine
220+
image: registry.drycc.cc/drycc/python-dev
214221
commands:
215-
- sed -i "s/docker.io/$${DRYCC_REGISTRY}/g" .drone/manifest-buildpacks.tmpl
216-
- sed -i "s/docker.io/$${DRYCC_REGISTRY}/g" builder.toml
222+
- sed -i "s/registry.drycc.cc/$${DRYCC_REGISTRY}/g" .drone/manifest-buildpacks.tmpl
223+
- sed -i "s/registry.drycc.cc/$${DRYCC_REGISTRY}/g" builder.toml
217224
- sed -i "s/20/$${STACK}/g" .drone/manifest-buildpacks.tmpl
218225
- sed -i "s/20/$${STACK}/g" builder.toml
219226
environment:
@@ -226,9 +233,9 @@ steps:
226233
settings:
227234
spec: .drone/manifest-buildpacks.tmpl
228235
username:
229-
from_secret: docker_username
236+
from_secret: container_username
230237
password:
231-
from_secret: docker_password
238+
from_secret: container_password
232239
environment:
233240
STACK: 20
234241
DEV_REGISTRY:

‎.drone/manifest-build.tmpl‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
1-
image: docker.io/drycc/pack:bullseye-build
1+
image: registry.drycc.cc/drycc/pack:bullseye-build
22
manifests:
33
-
4-
image: docker.io/drycc/pack:bullseye-linux-amd64-build
4+
image: registry.drycc.cc/drycc/pack:bullseye-linux-amd64-build
55
platform:
66
architecture: amd64
77
os: linux
88
-
9-
image: docker.io/drycc/pack:bullseye-linux-arm64-build
9+
image: registry.drycc.cc/drycc/pack:bullseye-linux-arm64-build
1010
platform:
1111
architecture: arm64
1212
os: linux

‎.drone/manifest-buildpacks.tmpl‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
1-
image: docker.io/drycc/buildpacks:bullseye
1+
image: registry.drycc.cc/drycc/buildpacks:bullseye
22
manifests:
33
-
4-
image: docker.io/drycc/buildpacks:bullseye-linux-amd64
4+
image: registry.drycc.cc/drycc/buildpacks:bullseye-linux-amd64
55
platform:
66
architecture: amd64
77
os: linux
88
-
9-
image: docker.io/drycc/buildpacks:bullseye-linux-arm64
9+
image: registry.drycc.cc/drycc/buildpacks:bullseye-linux-arm64
1010
platform:
1111
architecture: arm64
1212
os: linux

‎.drone/manifest-run.tmpl‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
1-
image: docker.io/drycc/pack:bullseye
1+
image: registry.drycc.cc/drycc/pack:bullseye
22
manifests:
33
-
4-
image: docker.io/drycc/pack:bullseye-linux-amd64
4+
image: registry.drycc.cc/drycc/pack:bullseye-linux-amd64
55
platform:
66
architecture: amd64
77
os: linux
88
-
9-
image: docker.io/drycc/pack:bullseye-linux-arm64
9+
image: registry.drycc.cc/drycc/pack:bullseye-linux-arm64
1010
platform:
1111
architecture: arm64
1212
os: linux

‎Makefile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# If DRYCC_REGISTRY is not set, try to populate it from legacy DEV_REGISTRY
22
CODENAME ?= bullseye
3-
DEV_REGISTRY ?= docker.io
3+
DEV_REGISTRY ?= registry.drycc.cc
44
DRYCC_REGISTRY ?= ${DEV_REGISTRY}
55
PLATFORM ?= $(shell python3 _scripts/utils.py platform)
66
ARCH ?= $(shell python3 _scripts/utils.py arch)

‎README.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ The basic image is based on Debian system, See the table below for system descri
2121

2222
STACK ID | Buildpacks image | Operating System
2323
-------------|---------------------------------|---------------------------------
24-
drycc-20 | docker.io/drycc/buildpacks:20 | Debian 11 Bullseye
24+
drycc-20 | registry.drycc.cc/drycc/buildpacks:20 | Debian 11 Bullseye
2525

2626
The basic layer of buildpack supports custom software sources and custom software.
2727
For example, if we use alicloud to install libpq-dev, we can add `.deb-list` and `·source-list` files to the project.

0 commit comments

Comments
 (0)