Skip to content

Commit a16b96d

Browse files
committed
chore(go-dev): use registry.drycc.cc replace docker.io
1 parent 36c7e82 commit a16b96d

5 files changed

Lines changed: 38 additions & 39 deletions

File tree

.drone/drone.yml

Lines changed: 33 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -9,14 +9,13 @@ platform:
99
steps:
1010
- name: test
1111
commands:
12+
- mkdir -p $HOMEPATH/.docker; echo $IMAGE_PULL_SECRETS > $HOMEPATH/.docker/config.json
1213
- make test
1314
environment:
1415
DEV_REGISTRY:
1516
from_secret: dev_registry
16-
DOCKER_USERNAME:
17-
from_secret: docker_username
18-
DOCKER_PASSWORD:
19-
from_secret: docker_password
17+
IMAGE_PULL_SECRETS:
18+
from_secret: container_pull_secrets
2019
when:
2120
event:
2221
- push
@@ -25,17 +24,17 @@ steps:
2524

2625
- name: publish
2726
commands:
27+
- echo $CONTAINER_PASSWORD | docker login $DRYCC_REGISTRY --username $CONTAINER_USERNAME --password-stdin > /dev/null 2>&1
2828
- make build
29-
- echo $DOCKER_PASSWORD | docker login --username $DOCKER_USERNAME --password-stdin
3029
- make push
3130
environment:
3231
VERSION: ${DRONE_TAG:-latest}-linux-amd64
33-
DEV_REGISTRY:
34-
from_secret: dev_registry
35-
DOCKER_USERNAME:
36-
from_secret: docker_username
37-
DOCKER_PASSWORD:
38-
from_secret: docker_password
32+
DRYCC_REGISTRY:
33+
from_secret: drycc_registry
34+
CONTAINER_USERNAME:
35+
from_secret: container_username
36+
CONTAINER_PASSWORD:
37+
from_secret: container_password
3938
when:
4039
event:
4140
- push
@@ -53,10 +52,13 @@ platform:
5352
steps:
5453
- name: test
5554
commands:
55+
- mkdir -p $HOMEPATH/.docker; echo $IMAGE_PULL_SECRETS > $HOMEPATH/.docker/config.json
5656
- make test
5757
environment:
58-
DEV_REGISTRY:
59-
from_secret: dev_registry
58+
DRYCC_REGISTRY:
59+
from_secret: drycc_registry
60+
IMAGE_PULL_SECRETS:
61+
from_secret: container_pull_secrets
6062
when:
6163
event:
6264
- push
@@ -65,17 +67,17 @@ steps:
6567

6668
- name: publish
6769
commands:
70+
- echo $CONTAINER_PASSWORD | docker login $DRYCC_REGISTRY --username $CONTAINER_USERNAME --password-stdin > /dev/null 2>&1
6871
- make build
69-
- echo $DOCKER_PASSWORD | docker login --username $DOCKER_USERNAME --password-stdin
7072
- make push
7173
environment:
7274
VERSION: ${DRONE_TAG:-latest}-linux-arm64
73-
DEV_REGISTRY:
74-
from_secret: dev_registry
75-
DOCKER_USERNAME:
76-
from_secret: docker_username
77-
DOCKER_PASSWORD:
78-
from_secret: docker_password
75+
DRYCC_REGISTRY:
76+
from_secret: drycc_registry
77+
CONTAINER_USERNAME:
78+
from_secret: container_username
79+
CONTAINER_PASSWORD:
80+
from_secret: container_password
7981
when:
8082
event:
8183
- push
@@ -85,13 +87,19 @@ steps:
8587
kind: pipeline
8688
type: docker
8789
name: manifest
90+
image_pull_secrets:
91+
- container_pull_secrets
8892

8993
steps:
90-
- name: manifest
91-
image: docker.io/library/alpine
94+
95+
- name: generate manifest
96+
image: registry.drycc.cc/drycc/python-dev
97+
pull: always
9298
commands:
93-
- sed -i "s/docker.io/$${DRYCC_REGISTRY}/g" .drone/manifest.tmpl
99+
- sed -i "s/registry.drycc.cc/$${DRYCC_REGISTRY}/g" .drone/manifest.tmpl
94100
environment:
101+
DEV_REGISTRY:
102+
from_secret: dev_registry
95103
DRYCC_REGISTRY:
96104
from_secret: drycc_registry
97105

@@ -100,12 +108,9 @@ steps:
100108
settings:
101109
spec: .drone/manifest.tmpl
102110
username:
103-
from_secret: docker_username
111+
from_secret: container_username
104112
password:
105-
from_secret: docker_password
106-
environment:
107-
DEV_REGISTRY:
108-
from_secret: dev_registry
113+
from_secret: container_password
109114

110115
trigger:
111116
event:

.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/go-dev:{{#if build.tag}}{{trimPrefix "v" build.tag}}{{else}}latest{{/if}}
1+
image: registry.drycc.cc/drycc/go-dev:{{#if build.tag}}{{trimPrefix "v" build.tag}}{{else}}latest{{/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/go-dev:{{#if build.tag}}{{build.tag}}-{{else}}latest-{{/if}}linux-amd64
10+
image: registry.drycc.cc/drycc/go-dev:{{#if build.tag}}{{build.tag}}-{{else}}latest-{{/if}}linux-amd64
1111
platform:
1212
architecture: amd64
1313
os: linux
1414
-
15-
image: docker.io/drycc/go-dev:{{#if build.tag}}{{build.tag}}-{{else}}latest-{{/if}}linux-arm64
15+
image: registry.drycc.cc/drycc/go-dev:{{#if build.tag}}{{build.tag}}-{{else}}latest-{{/if}}linux-arm64
1616
platform:
1717
architecture: arm64
1818
os: linux

Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
VERSION ?= $(shell git describe --tags --exact-match 2>/dev/null || echo latest)
2-
DEV_REGISTRY ?= docker.io
2+
DEV_REGISTRY ?= registry.drycc.cc
33
IMAGE_PREFIX ?= drycc
44
IMAGE := ${DEV_REGISTRY}/${IMAGE_PREFIX}/go-dev:${VERSION}
55
PLATFORM ?= linux/amd64,linux/arm64

_scripts/ci/deploy.sh

Lines changed: 0 additions & 6 deletions
This file was deleted.

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
LABEL name="drycc-go-dev"
44

0 commit comments

Comments
 (0)