Skip to content

Commit 6cecd64

Browse files
committed
chore(database): use registry.drycc.cc replace docker.io
1 parent 5091a0e commit 6cecd64

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,11 +9,16 @@ platform:
99
steps:
1010
- name: test
1111
commands:
12+
- mkdir -p $HOMEPATH/.docker; echo $IMAGE_PULL_SECRETS > $HOMEPATH/.docker/config.json
1213
- make docker-build 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:
5156
steps:
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,14 +77,19 @@ steps:
7277
kind: pipeline
7378
type: docker
7479
name: manifest
80+
image_pull_secrets:
81+
- container_pull_secrets
7582

7683
steps:
84+
7785
- name: generate manifest
78-
image: docker.io/drycc/go-dev
86+
image: registry.drycc.cc/drycc/python-dev
7987
pull: always
8088
commands:
81-
- sed -i "s/docker.io/$${DRYCC_REGISTRY}/g" .drone/manifest.tmpl
89+
- sed -i "s/registry.drycc.cc/$${DRYCC_REGISTRY}/g" .drone/manifest.tmpl
8290
environment:
91+
DEV_REGISTRY:
92+
from_secret: dev_registry
8393
DRYCC_REGISTRY:
8494
from_secret: drycc_registry
8595

@@ -88,9 +98,9 @@ steps:
8898
settings:
8999
spec: .drone/manifest.tmpl
90100
username:
91-
from_secret: docker_username
101+
from_secret: container_username
92102
password:
93-
from_secret: docker_password
103+
from_secret: container_password
94104
environment:
95105
DEV_REGISTRY:
96106
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/postgres:{{#if build.tag}}{{trimPrefix "v" build.tag}}{{else}}canary{{/if}}
1+
image: registry.drycc.cc/drycc/postgres:{{#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/postgres:{{#if build.tag}}{{build.tag}}-{{else}}latest-{{/if}}linux-amd64
10+
image: registry.drycc.cc/drycc/postgres:{{#if build.tag}}{{build.tag}}-{{else}}latest-{{/if}}linux-amd64
1111
platform:
1212
architecture: amd64
1313
os: linux
1414
-
15-
image: docker.io/drycc/postgres:{{#if build.tag}}{{build.tag}}-{{else}}latest-{{/if}}linux-arm64
15+
image: registry.drycc.cc/drycc/postgres:{{#if build.tag}}{{build.tag}}-{{else}}latest-{{/if}}linux-arm64
1616
platform:
1717
architecture: arm64
1818
os: linux

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
COPY rootfs/bin /bin/
44
COPY rootfs/docker-entrypoint-initdb.d /docker-entrypoint-initdb.d/

charts/database/templates/database-deployment.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ spec:
2323
serviceAccount: drycc-database
2424
initContainers:
2525
- name: drycc-database-init
26-
image: docker.io/drycc/python-dev:latest
26+
image: registry.drycc.cc/drycc/python-dev:latest
2727
imagePullPolicy: {{.Values.imagePullPolicy}}
2828
args:
2929
- netcat

charts/database/values.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
imageOrg: "drycc"
22
imagePullPolicy: "Always"
33
imageTag: "canary"
4-
imageRegistry: "docker.io"
4+
imageRegistry: "registry.drycc.cc"
55
# limitsCpu: "100m"
66
# limitsMemory: "50Mi"
77
# limitsHugepages2Mi: 100Mi

0 commit comments

Comments
 (0)