diff --git a/modules/apps/vehicle-history-app/src/test/java/com/lingniu/ingest/historyapp/WoodpeckerPipelineTest.java b/modules/apps/vehicle-history-app/src/test/java/com/lingniu/ingest/historyapp/WoodpeckerPipelineTest.java index 00ac1621..1645a397 100644 --- a/modules/apps/vehicle-history-app/src/test/java/com/lingniu/ingest/historyapp/WoodpeckerPipelineTest.java +++ b/modules/apps/vehicle-history-app/src/test/java/com/lingniu/ingest/historyapp/WoodpeckerPipelineTest.java @@ -45,6 +45,18 @@ class WoodpeckerPipelineTest { .doesNotContain("-DskipTests"); } + @Test + void dockerPublishUsesOverridableImagePrefix() throws IOException { + String pipeline = Files.readString(repositoryRoot().resolve("woodpecker.yml")); + + assertThat(pipeline) + .contains("REGISTRY=${LINGNIU_IMAGE_REGISTRY:-crpi-85r4m0ackrm3qpje.cn-shanghai.personal.cr.aliyuncs.com}") + .contains("NAMESPACE=${LINGNIU_IMAGE_NAMESPACE:-oneos}") + .contains("IMAGE=$REGISTRY/$NAMESPACE/$APP_NAME:$APP_VERSION") + .doesNotContain("\n REGISTRY=crpi-85r4m0ackrm3qpje.cn-shanghai.personal.cr.aliyuncs.com") + .doesNotContain("\n NAMESPACE=oneos"); + } + @Test void dockerImageExposesOnlyCurrentProductionPorts() throws IOException { String dockerfile = Files.readString(repositoryRoot().resolve("Dockerfile")); diff --git a/woodpecker.yml b/woodpecker.yml index ad9e01d1..73eae03b 100644 --- a/woodpecker.yml +++ b/woodpecker.yml @@ -57,8 +57,8 @@ steps: commands: | cd $CI_WORKSPACE APP_VERSION=$(cat $CI_WORKSPACE/project_version.txt) - REGISTRY=crpi-85r4m0ackrm3qpje.cn-shanghai.personal.cr.aliyuncs.com - NAMESPACE=oneos + REGISTRY=${LINGNIU_IMAGE_REGISTRY:-crpi-85r4m0ackrm3qpje.cn-shanghai.personal.cr.aliyuncs.com} + NAMESPACE=${LINGNIU_IMAGE_NAMESPACE:-oneos} printf '%s' "$ALIYUN_ACR_PASSWORD" | docker login \ --username "$ALIYUN_ACR_USERNAME" \