Skip to content

Commit 7e840e4

Browse files
committed
chore(base): add codename build-arg
1 parent f24cb2a commit 7e840e4

6 files changed

Lines changed: 8 additions & 5 deletions

File tree

.woodpecker/build-linux.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@ pipeline:
1616
- echo $CONTAINER_PASSWORD | docker login $DRYCC_REGISTRY --username $CONTAINER_USERNAME --password-stdin > /dev/null 2>&1
1717
- make clean docker-build docker-immutable-push clean
1818
secrets:
19+
- codename
1920
- dev_registry
2021
- drycc_registry
2122
- container_username

.woodpecker/manifest.tmpl

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

.woodpecker/manifest.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,11 @@ pipeline:
77
- name: generate-manifest
88
image: bash
99
commands:
10+
- sed -i "s/{{codename}}/$${CODENAME}/g" .woodpecker/manifest.tmpl
1011
- sed -i "s/{{project}}/$${CI_REPO_NAME}/g" .woodpecker/manifest.tmpl
1112
- sed -i "s/registry.drycc.cc/$${DRYCC_REGISTRY}/g" .woodpecker/manifest.tmpl
1213
secrets:
14+
- codename
1315
- drycc_registry
1416
when:
1517
event:

.woodpecker/test-linux.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@ pipeline:
1414
commands:
1515
- make test
1616
secrets:
17+
- codename
1718
- dev_registry
1819
when:
1920
event:

Makefile

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
CODENAME ?= bookworm
21
DEV_REGISTRY ?= registry.drycc.cc
32
DRYCC_REGISTRY ?= ${DEV_REGISTRY}
43
IMAGE = "${DRYCC_REGISTRY}"/drycc/base:"${CODENAME}"-"$(shell dpkg --print-architecture)"

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ A slimmed-down Debian-based container image used as the basis of [Drycc Workflow
99
Start your Dockerfile with this line:
1010

1111
```
12-
FROM registry.drycc.cc/drycc/base:bookworm
12+
FROM registry.drycc.cc/drycc/base:codename
1313
```
1414

1515
There isn't a `:latest` tag, because each debian version is a tag.

0 commit comments

Comments
 (0)