mirror of
https://github.com/cloudflare/cloudflared.git
synced 2026-06-23 04:10:20 +00:00
TUN-9251: Publish internal image
Publishing internal image in cloudflared. This allows us to remove the dependency from cloudflare/plat/dockerfiles. In addition, our acceptance tests should now be able to use the latest image instead of relying on a fixed version for testing, which will allow us to detect potential failures earlier.
This commit is contained in:
@@ -0,0 +1,34 @@
|
|||||||
|
include:
|
||||||
|
- local: .ci/commons.gitlab-ci.yml
|
||||||
|
|
||||||
|
###########################################################################
|
||||||
|
### Build and Push Internal Image (commit SHA on master, version on tag) ###
|
||||||
|
###########################################################################
|
||||||
|
- component: $CI_SERVER_FQDN/cloudflare/ci/docker-image/build-push-image@~latest
|
||||||
|
inputs:
|
||||||
|
stage: release-internal
|
||||||
|
jobPrefix: internal-image
|
||||||
|
runOnMR: false
|
||||||
|
runOnBranches: '^master$'
|
||||||
|
needs:
|
||||||
|
- generate-internal-image-version
|
||||||
|
commentImageRefs: false
|
||||||
|
runner: vm-linux-x86-4cpu-8gb
|
||||||
|
EXTRA_DIB_ARGS: "--manifest=.docker-images-internal"
|
||||||
|
|
||||||
|
###############################################################################
|
||||||
|
### Generate Internal Image Version File ###
|
||||||
|
### Uses `git describe`: version tag on tagged commits, SHA-based on master ###
|
||||||
|
###############################################################################
|
||||||
|
generate-internal-image-version:
|
||||||
|
stage: release-internal
|
||||||
|
image: $BUILD_IMAGE
|
||||||
|
rules:
|
||||||
|
- !reference [.default-rules, run-on-master]
|
||||||
|
needs:
|
||||||
|
- ci-image-get-image-ref
|
||||||
|
script:
|
||||||
|
- make generate-internal-image-version
|
||||||
|
artifacts:
|
||||||
|
paths:
|
||||||
|
- versions-internal
|
||||||
@@ -0,0 +1,8 @@
|
|||||||
|
images:
|
||||||
|
- name: cloudflared-daemon
|
||||||
|
dockerfile: Dockerfile.$ARCH
|
||||||
|
context: .
|
||||||
|
version_file: versions-internal
|
||||||
|
architectures:
|
||||||
|
- amd64
|
||||||
|
- arm64
|
||||||
@@ -63,6 +63,11 @@ include:
|
|||||||
#####################################################
|
#####################################################
|
||||||
- local: .ci/apt-internal.gitlab-ci.yml
|
- local: .ci/apt-internal.gitlab-ci.yml
|
||||||
|
|
||||||
|
#####################################################
|
||||||
|
########## Release Internal Docker Image ############
|
||||||
|
#####################################################
|
||||||
|
- local: .ci/internal-image.gitlab-ci.yml
|
||||||
|
|
||||||
#####################################################
|
#####################################################
|
||||||
############## Manual Claude Review #################
|
############## Manual Claude Review #################
|
||||||
#####################################################
|
#####################################################
|
||||||
|
|||||||
@@ -159,6 +159,10 @@ container:
|
|||||||
generate-docker-version:
|
generate-docker-version:
|
||||||
echo latest $(VERSION) > versions
|
echo latest $(VERSION) > versions
|
||||||
|
|
||||||
|
.PHONY: generate-internal-image-version
|
||||||
|
generate-internal-image-version:
|
||||||
|
echo $(VERSION) > versions-internal
|
||||||
|
|
||||||
|
|
||||||
.PHONY: test
|
.PHONY: test
|
||||||
test: vet
|
test: vet
|
||||||
|
|||||||
Reference in New Issue
Block a user