Skip to content

Commit 892ab75

Browse files
committed
chore(helmbroker): use registry.drycc.cc replace docker.io
1 parent 412cc6a commit 892ab75

5 files changed

Lines changed: 32 additions & 22 deletions

File tree

.drone/drone.yml

Lines changed: 26 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -9,13 +9,18 @@ platform:
99
steps:
1010
- name: test
1111
commands:
12+
- mkdir -p $HOMEPATH/.docker; echo $IMAGE_PULL_SECRETS > $HOMEPATH/.docker/config.json
1213
- make test-style
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
1720
CODECOV_TOKEN:
1821
from_secret: codecov_token
22+
IMAGE_PULL_SECRETS:
23+
from_secret: container_pull_secrets
1924
when:
2025
event:
2126
- push
@@ -24,18 +29,18 @@ steps:
2429

2530
- name: publish
2631
commands:
27-
- echo $DOCKER_PASSWORD | docker login $DRYCC_REGISTRY --username $DOCKER_USERNAME --password-stdin
32+
- echo $CONTAINER_PASSWORD | docker login $DRYCC_REGISTRY --username $CONTAINER_USERNAME --password-stdin > /dev/null 2>&1
2833
- make docker-build docker-immutable-push
2934
environment:
3035
VERSION: ${DRONE_TAG:-latest}-linux-amd64
3136
DEV_REGISTRY:
3237
from_secret: dev_registry
3338
DRYCC_REGISTRY:
3439
from_secret: drycc_registry
35-
DOCKER_USERNAME:
36-
from_secret: docker_username
37-
DOCKER_PASSWORD:
38-
from_secret: docker_password
40+
CONTAINER_USERNAME:
41+
from_secret: container_username
42+
CONTAINER_PASSWORD:
43+
from_secret: container_password
3944
when:
4045
event:
4146
- push
@@ -53,18 +58,18 @@ platform:
5358
steps:
5459
- name: publish
5560
commands:
56-
- echo $DOCKER_PASSWORD | docker login $DRYCC_REGISTRY --username $DOCKER_USERNAME --password-stdin
61+
- echo $CONTAINER_PASSWORD | docker login $DRYCC_REGISTRY --username $CONTAINER_USERNAME --password-stdin > /dev/null 2>&1
5762
- make docker-build docker-immutable-push
5863
environment:
5964
VERSION: ${DRONE_TAG:-latest}-linux-arm64
6065
DEV_REGISTRY:
6166
from_secret: dev_registry
6267
DRYCC_REGISTRY:
6368
from_secret: drycc_registry
64-
DOCKER_USERNAME:
65-
from_secret: docker_username
66-
DOCKER_PASSWORD:
67-
from_secret: docker_password
69+
CONTAINER_USERNAME:
70+
from_secret: container_username
71+
CONTAINER_PASSWORD:
72+
from_secret: container_password
6873
when:
6974
event:
7075
- push
@@ -74,14 +79,19 @@ steps:
7479
kind: pipeline
7580
type: docker
7681
name: manifest
82+
image_pull_secrets:
83+
- container_pull_secrets
7784

7885
steps:
86+
7987
- name: generate manifest
80-
image: docker.io/library/alpine
88+
image: registry.drycc.cc/drycc/python-dev
8189
pull: always
8290
commands:
83-
- sed -i "s/docker.io/$${DRYCC_REGISTRY}/g" .drone/manifest.tmpl
91+
- sed -i "s/registry.drycc.cc/$${DRYCC_REGISTRY}/g" .drone/manifest.tmpl
8492
environment:
93+
DEV_REGISTRY:
94+
from_secret: dev_registry
8595
DRYCC_REGISTRY:
8696
from_secret: drycc_registry
8797

@@ -90,9 +100,9 @@ steps:
90100
settings:
91101
spec: .drone/manifest.tmpl
92102
username:
93-
from_secret: docker_username
103+
from_secret: container_username
94104
password:
95-
from_secret: docker_password
105+
from_secret: container_password
96106
environment:
97107
DEV_REGISTRY:
98108
from_secret: dev_registry

.drone/manifest.tmpl

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
image: docker.io/drycc/helmbroker:{{#if build.tag}}{{trimPrefix "v" build.tag}}{{else}}canary{{/if}}
1+
image: registry.drycc.cc/drycc/helmbroker:{{#if build.tag}}{{trimPrefix "v" build.tag}}{{else}}canary{{/if}}
22
{{#if build.tags}}
33
tags:
44
{{#each build.tags}}
@@ -7,12 +7,12 @@ tags:
77
{{/if}}
88
manifests:
99
-
10-
image: docker.io/drycc/helmbroker:{{#if build.tag}}{{build.tag}}-{{else}}latest-{{/if}}linux-amd64
10+
image: registry.drycc.cc/drycc/helmbroker:{{#if build.tag}}{{build.tag}}-{{else}}latest-{{/if}}linux-amd64
1111
platform:
1212
architecture: amd64
1313
os: linux
1414
-
15-
image: docker.io/drycc/helmbroker:{{#if build.tag}}{{build.tag}}-{{else}}latest-{{/if}}linux-arm64
15+
image: registry.drycc.cc/drycc/helmbroker:{{#if build.tag}}{{build.tag}}-{{else}}latest-{{/if}}linux-arm64
1616
platform:
1717
architecture: arm64
1818
os: linux

charts/helmbroker/values.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
imageOrg: "drycc"
22
imageTag: "canary"
3-
imageRegistry: "docker.io"
3+
imageRegistry: "registry.drycc.cc"
44
imagePullPolicy: "Always"
55
replicas: 1
66
# limitsCpu: "100m"

rootfs/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM docker.io/drycc/base:bullseye
1+
FROM registry.drycc.cc/drycc/base:bullseye
22

33
ENV DRYCC_UID=1001 \
44
DRYCC_GID=1001 \

rootfs/Dockerfile.test

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM docker.io/drycc/base:bullseye
1+
FROM registry.drycc.cc/drycc/base:bullseye
22

33
ENV DRYCC_UID=1001 \
44
DRYCC_GID=1001 \

0 commit comments

Comments
 (0)