Skip to content

Commit

Permalink
feat(makefile): set default melange runner to docker (#32207)
Browse files Browse the repository at this point in the history
Continuous integration and automation runs pipelines in Docker with
Melange, in order to provide consistency and homogeneous environment, it
sets the default runner to Docker. The Make variable can be inherited
and overridden.

  Related:
  - chainguard-dev/melange#1611

Signed-off-by: Massimiliano Giovagnoli <[email protected]>
  • Loading branch information
maxgio92 authored Oct 29, 2024
1 parent 1416ae9 commit 0b06f8e
Showing 1 changed file with 5 additions and 0 deletions.
5 changes: 5 additions & 0 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,9 @@ KEY ?= local-melange.rsa
REPO ?= $(shell pwd)/packages
CACHE_DIR ?= gs://wolfi-sources/

# Default Melange runner is Docker.
MELANGE_RUNNER ?= docker

MELANGE_OPTS += --repository-append ${REPO}
MELANGE_OPTS += --keyring-append ${KEY}.pub
MELANGE_OPTS += --signing-key ${KEY}
Expand All @@ -21,6 +24,7 @@ MELANGE_OPTS += --license 'Apache-2.0'
MELANGE_OPTS += --git-repo-url 'https://github.com/wolfi-dev/os'
MELANGE_OPTS += --generate-index false # TODO: This false gets parsed as argv not flag value!!!
MELANGE_OPTS += --pipeline-dir ./pipelines/
MELANGE_OPTS += --runner=$(MELANGE_RUNNER)
MELANGE_OPTS += ${MELANGE_EXTRA_OPTS}

# Enter interactive mode on failure for debug
Expand All @@ -41,6 +45,7 @@ MELANGE_TEST_OPTS += --repository-append https://packages.wolfi.dev/os
MELANGE_TEST_OPTS += --keyring-append https://packages.wolfi.dev/os/wolfi-signing.rsa.pub
MELANGE_TEST_OPTS += --test-package-append wolfi-base
MELANGE_TEST_OPTS += --debug
MELANGE_TEST_OPTS += --runner=$(MELANGE_RUNNER)
MELANGE_TEST_OPTS += ${MELANGE_EXTRA_OPTS}

ifeq (${USE_CACHE}, yes)
Expand Down

0 comments on commit 0b06f8e

Please sign in to comment.