Skip to content
Permalink

Comparing changes

This is a direct comparison between two commits made in this repository or its related repositories. View the default comparison for this range or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: projectsyn/component-argocd
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: afab0b01b89132325d34cbc21b1b99ba81d47d26
Choose a base ref
..
head repository: projectsyn/component-argocd
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: bf25ab3cfbb1bb94be0ee5f87b8e77d8d3a44e4c
Choose a head ref
Showing with 15 additions and 6 deletions.
  1. +14 −5 Makefile.vars.mk
  2. +1 −1 class/defaults.yml
19 changes: 14 additions & 5 deletions Makefile.vars.mk
Original file line number Diff line number Diff line change
@@ -4,13 +4,22 @@
# Additional Makefiles can be added to `.sync.yml` in 'Makefile.includes'
#

# Commodore takes the root dir name as the component name
COMPONENT_NAME ?= $(shell basename ${PWD} | sed s/component-//)
# The component name is hard-coded from the template
COMPONENT_NAME ?= argocd

git_dir ?= $(shell git rev-parse --git-common-dir)
compiled_path ?= compiled/$(COMPONENT_NAME)/$(COMPONENT_NAME)
root_volume ?= -v "$${PWD}:/$(COMPONENT_NAME)"
compiled_volume ?= -v "$${PWD}/$(compiled_path):/$(COMPONENT_NAME)"
commodore_args ?= --search-paths ./dependencies --search-paths .
commodore_args ?= --search-paths ./dependencies --search-paths . -n $(COMPONENT_NAME)

ifneq "$(git_dir)" ".git"
git_volume ?= -v "$(git_dir):$(git_dir):ro"
antora_git_volume ?= -v "$(git_dir):/preview/antora/.git:ro"
else
git_volume ?=
antora_git_volume ?= -v "${PWD}/.git:/preview/antora/.git:ro"
endif

ifneq "$(shell which docker 2>/dev/null)" ""
DOCKER_CMD ?= $(shell which docker)
@@ -34,9 +43,9 @@ YAMLLINT_DOCKER ?= $(DOCKER_CMD) $(DOCKER_ARGS) $(root_volume) $(YAMLLINT_IMAGE)
VALE_CMD ?= $(DOCKER_CMD) $(DOCKER_ARGS) $(root_volume) --volume "$${PWD}"/docs/modules:/pages docker.io/vshn/vale:2.1.1
VALE_ARGS ?= --minAlertLevel=error --config=/pages/ROOT/pages/.vale.ini /pages

ANTORA_PREVIEW_CMD ?= $(DOCKER_CMD) run --rm --publish 35729:35729 --publish 2020:2020 --volume "${PWD}/.git":/preview/antora/.git --volume "${PWD}/docs":/preview/antora/docs docker.io/vshn/antora-preview:3.0.1.1 --style=syn --antora=docs
ANTORA_PREVIEW_CMD ?= $(DOCKER_CMD) run --rm --publish 35729:35729 --publish 2020:2020 $(antora_git_volume) --volume "${PWD}/docs":/preview/antora/docs docker.io/vshn/antora-preview:3.0.1.1 --style=syn --antora=docs

COMMODORE_CMD ?= $(DOCKER_CMD) $(DOCKER_ARGS) $(root_volume) docker.io/projectsyn/commodore:latest
COMMODORE_CMD ?= $(DOCKER_CMD) $(DOCKER_ARGS) $(git_volume) $(root_volume) docker.io/projectsyn/commodore:latest
COMPILE_CMD ?= $(COMMODORE_CMD) component compile . $(commodore_args)
JB_CMD ?= $(DOCKER_CMD) $(DOCKER_ARGS) --entrypoint /usr/local/bin/jb docker.io/projectsyn/commodore:latest install

2 changes: 1 addition & 1 deletion class/defaults.yml
Original file line number Diff line number Diff line change
@@ -15,7 +15,7 @@ parameters:
images:
argocd:
image: quay.io/argoproj/argocd
tag: v2.4.9
tag: v2.4.10
redis:
image: docker.io/library/redis
tag: '6.2.6'