Skip to content

Commit

Permalink
- [build](Makefile) Due to changed behavior with docker 26, files are…
Browse files Browse the repository at this point in the history
… now copied on the host instead of being hard-linked.

- [build](Makefile) Now set `BLD_CVER ?= ast200` to match codec and asterisk versions.
- [demo](demo/docker-compose.yml) Remove obsolete element `version` in docker-compose.yml.
  • Loading branch information
mlan committed Apr 23, 2024
1 parent f742c00 commit db29412
Show file tree
Hide file tree
Showing 3 changed files with 10 additions and 4 deletions.
6 changes: 6 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,9 @@
# 1.1.8

- [build](Makefile) Due to changed behavior with docker 26, files are now copied on the host instead of being hard-linked.
- [build](Makefile) Now set `BLD_CVER ?= ast200` to match codec and asterisk versions.
- [demo](demo/docker-compose.yml) Remove obsolete element `version` in docker-compose.yml.

# 1.1.7

- [build](Makefile) Now use alpine:3.19 (asterisk:20.5.2).
Expand Down
6 changes: 3 additions & 3 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ BLD_VER ?= latest
BLD_TGT ?= full
BLD_TGTS ?= mini base full xtra
BLD_CMT ?= HEAD
BLD_CVER ?= ast160
BLD_CVER ?= ast200
BLD_DNLD ?= curl -o
BLD_KIT ?= DOCKER_BUILDKIT=1

Expand Down Expand Up @@ -53,14 +53,14 @@ pre_codecs: codec_g723.so codec_g729.so

sub/autoban/php/ami.class.inc: submodule
mkdir -p $(@D)
ln -f sub/module/phpami/src/Ami.php $@
cp --remove-destination sub/module/phpami/src/Ami.php $@

submodule:
git submodule update --init --recursive

codec_%.so: sub/codecs/download/codec_%-$(BLD_CVER).so
mkdir -p sub/codecs/module
ln -f $< sub/codecs/module/$@
cp --remove-destination $< sub/codecs/module/$@

.PRECIOUS: sub/codecs/download/%.so

Expand Down
2 changes: 1 addition & 1 deletion demo/docker-compose.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
version: '3'
name: demo

services:
tele:
Expand Down

0 comments on commit db29412

Please sign in to comment.