Navigation Menu

Skip to content

Commit

Permalink
fixup some language
Browse files Browse the repository at this point in the history
Signed-off-by: Kingdon Barrett <kingdon@weave.works>
  • Loading branch information
Kingdon Barrett committed May 25, 2021
1 parent 6b4a4bd commit d291ff9
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 8 deletions.
10 changes: 6 additions & 4 deletions Makefile
Expand Up @@ -15,11 +15,13 @@ FONT_AWESOME_TARGET := themes/$(DOCSY_COMMIT_FOLDER)/assets/vendor/$(FONT

DEV_IMAGE_REGISTRY_NAME := fluxcd
HUGO_VERSION ?= 0.78.2
DEV_IMAGE_BASE_NAME := website:hugo-$(HUGO_VERSION)-extended
PREVIEW_IMAGE_BASE_NAME := website:hugo-support
DEV_IMAGE_NAME := $(DEV_IMAGE_REGISTRY_NAME)/$(DEV_IMAGE_BASE_NAME)
PREVIEW_IMAGE_NAME := $(DEV_IMAGE_REGISTRY_NAME)/$(PREVIEW_IMAGE_BASE_NAME)
HUGO_IMAGE_BASE_NAME := website:hugo-$(HUGO_VERSION)-extended
SUPPORT_IMAGE_BASE_NAME := website:hugo-support
HUGO_IMAGE_NAME := $(DEV_IMAGE_REGISTRY_NAME)/$(HUGO_IMAGE_BASE_NAME)
SUPPORT_IMAGE_NAME := $(DEV_IMAGE_REGISTRY_NAME)/$(SUPPORT_IMAGE_BASE_NAME)
HUGO_BIND_ADDRESS ?= 127.0.0.1
BUILDER_CLI := docker
# BUILDER_CLI := okteto

help: ## Display this help menu.
@awk 'BEGIN {FS = ":.*##"; printf "\nUsage:\n make \033[36m<target>\033[0m\n"} /^[a-zA-Z_0-9-]+:.*?##/ { printf " \033[36m%-20s\033[0m %s\n", $$1, $$2 } /^##@/ { printf "\n\033[1m%s\033[0m\n", substr($$0, 5) } ' $(MAKEFILE_LIST)
Expand Down
6 changes: 2 additions & 4 deletions content/en/docs/use-cases/jenkins.md
Expand Up @@ -81,9 +81,7 @@ GitOps principles suggest that we should manage production workloads as purely d

Many parts are needed for a complete continuous delivery pipeline with Jenkins and Flux.

References are provided below to help highlight ideas that are likely to present in a functioning Jenkins image build pipeline. We'll also provide an example you may use to build images for development and testing. Then, with another Jenkins pipeline stage, we can run some tests in the image that was built.

Finally, a release stage will publish/release image tags for production deployment, based on git tags.
The reference below shows how to build and tag Docker images with Jenkins for development environments, for executing tests in a pipeline stage, and lastly tagging a release version for deployment in a production setting.

##### Testing Infrastructure

Expand Down Expand Up @@ -291,7 +289,7 @@ If you are concerned about running Docker and Kubernetes together, or if you nee

These were recently presented together at [KubeCon/CloudNativeCon EU 2021].

The finer points of building OCI images in Jenkins are out of scope for this guide. These examples are meant to be kept simple (though they should be complete), and we refrain from sharing strong opinions about how CI should work here, because it's simply out of scope for Flux to weigh in about these things. We meant to show some ways that Jenkins (or any similar functioning CI tool) can interact with Flux.
The finer points of building OCI images in Jenkins are out of scope for this guide. These examples are meant to be kept simple, though complete, and we refrain from sharing strong opinions about how CI should work here, because it's simply out of scope for Flux to weigh in about these topics. We meant to show some ways that Jenkins CI, or any similar functioning tool, can be used with Flux.

This works without Jenkins connecting to production clusters, only building images, and Flux only receives published image tags. So there is no strong coupling or inter-dependency between CI and CD!

Expand Down

0 comments on commit d291ff9

Please sign in to comment.