Compare commits

..

2 Commits

Author SHA1 Message Date
8b25dbdca2 Use shell to invoke ChordPro
Some checks failed
Build / build (push) Failing after 3s
This allows us to run the makefile with or without a shell function
with Docker. This should work both locally and during build in the
pipeline.
2024-06-01 11:53:13 +02:00
d1ba57009d Describe Docker usage
[ci skip]
2024-06-01 11:52:48 +02:00
2 changed files with 14 additions and 2 deletions

View File

@ -6,13 +6,15 @@ SONG_PDF := $(patsubst %$(SRC_EXTENSION),%.pdf,$(SONG_CHO))
SONG_HTML := $(patsubst %$(SRC_EXTENSION),%.html,$(SONG_CHO)) SONG_HTML := $(patsubst %$(SRC_EXTENSION),%.html,$(SONG_CHO))
SONGBOOK := songbook.pdf SONGBOOK := songbook.pdf
SHELL := $(shell echo $$SHELL)
.DEFAULT_GOAL := all .DEFAULT_GOAL := all
%.pdf: %$(SRC_EXTENSION) %.pdf: %$(SRC_EXTENSION)
chordpro --config=chordpro.json -o $@ $< $(SHELL) -c 'chordpro --config=chordpro.json -o $@ $<'
%.html: %$(SRC_EXTENSION) %.html: %$(SRC_EXTENSION)
chordpro --config=chordpro.json -o $@ $< $(SHELL) -c 'chordpro --config=chordpro.json -o $@ $<'
all: $(SONG_PDF) $(SONG_HTML) $(SONGBOOK) all: $(SONG_PDF) $(SONG_HTML) $(SONGBOOK)

View File

@ -12,6 +12,16 @@ integrated with a shell alias:
alias chordpro="docker run -ti --rm --env HOME=\$HOME --env USER=\$USER --workdir \$(pwd) --volume \$HOME:\$HOME chordpro/chordpro:latest chordpro" alias chordpro="docker run -ti --rm --env HOME=\$HOME --env USER=\$USER --workdir \$(pwd) --volume \$HOME:\$HOME chordpro/chordpro:latest chordpro"
``` ```
This will not function with the included makefile, so you will have to
export this as a shell function (for example in `.bashrc`):
```
chordpro() {
docker run -ti --rm --env HOME=$HOME --env USER=$USER --workdir "$(pwd)" --volume "$HOME:$HOME" chordpro/chordpro:latest chordpro "$@"
}
export -f chordpro
```
[1]: https://www.chordpro.org/chordpro/chordpro-installation/ [1]: https://www.chordpro.org/chordpro/chordpro-installation/
## Building ## Building