Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
engine-core
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package registry
Container registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
AURA
engine-core
Commits
7fd70146
Commit
7fd70146
authored
1 year ago
by
Chris Pastl
Browse files
Options
Downloads
Patches
Plain Diff
refactor: adapt make and dockerfile, add pulse test
parent
2d4602c1
No related branches found
No related tags found
No related merge requests found
Pipeline
#5961
passed
1 year ago
Stage: test
Changes
4
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
Dockerfile
+12
-2
12 additions, 2 deletions
Dockerfile
Makefile
+3
-1
3 additions, 1 deletion
Makefile
config/sample.engine-core.docker.ini
+1
-1
1 addition, 1 deletion
config/sample.engine-core.docker.ini
tests/mac-pulse-docker.sh
+5
-0
5 additions, 0 deletions
tests/mac-pulse-docker.sh
with
21 additions
and
4 deletions
Dockerfile
+
12
−
2
View file @
7fd70146
...
...
@@ -12,7 +12,15 @@ RUN apt update --allow-releaseinfo-change && \
apt
-y
--no-install-recommends
install
\
build-essential
\
alsa-utils
\
libssl-dev
libssl-dev
\
espeak
\
vorbis-tools
\
sox
\
libasound2
\
libasound2-plugins
\
pulseaudio
\
pulseaudio-utils
# Setup Engine
ENV
TZ=Europe/Vienna
...
...
@@ -26,7 +34,9 @@ COPY VERSION /srv/VERSION
RUN
groupadd
--gid
${
AURA_GID
}
aura
&&
\
useradd
--gid
${
AURA_GID
}
--no-user-group
--uid
${
AURA_UID
}
--home-dir
/srv
--no-create-home
aura
&&
\
chown
-R
${
AURA_UID
}
:
${
AURA_GID
}
/srv /var/audio
chown
-R
${
AURA_UID
}
:
${
AURA_GID
}
/srv /var/audio
&&
\
usermod
-aG
audio,pulse,pulse-access aura
&&
\
chown
-R
aura:aura
$HOME
USER
aura
...
...
This diff is collapsed.
Click to expand it.
Makefile
+
3
−
1
View file @
7fd70146
...
...
@@ -24,6 +24,7 @@ help::
# Settings
AURA_ENGINE_CORE_ALSA_CONFIG
:=
${
CURDIR
}
/config/asound.conf
AURA_ENGINE_CORE_PULSE_CONFIG
:=
${
CURDIR
}
/config/pulse
AURA_ENGINE_CORE_SOCKET
:=
"aura_engine_socket"
AURA_ENGINE_CORE_CONFIG
:=
${
CURDIR
}
/config/engine-core.docker.ini
AURA_AUDIO_STORE_SOURCE
:=
${
CURDIR
}
/audio/source
...
...
@@ -37,10 +38,11 @@ DOCKER_RUN = @docker run \
--name
$(
APP_NAME
)
\
--network
=
"host"
\
--mount
type
=
tmpfs,destination
=
/tmp
\
--device
/dev/snd
\
--group-add
audio
\
--ulimit
rtprio
=
95
--ulimit
memlock
=
-1
--shm-size
=
512m
\
--env-file
docker.env
\
-e
PULSE_SERVER
=
host.docker.internal
\
--mount
type
=
bind
,source
=
/Users/chris/.config/pulse,target
=
/home/pulseaudio/.config/pulse
\
-v
"
$(
AURA_ENGINE_CORE_ALSA_CONFIG
)
"
:
"/etc/asound.conf"
\
-v
"
$(
AURA_ENGINE_CORE_SOCKET
)
"
:
"/srv/socket"
\
-v
"
$(
AURA_ENGINE_CORE_CONFIG
)
"
:
"/etc/aura/engine-core.ini"
:ro
\
...
...
This diff is collapsed.
Click to expand it.
config/sample.engine-core.docker.ini
+
1
−
1
View file @
7fd70146
...
...
@@ -61,7 +61,7 @@ fallback_music_folder="/var/audio/fallback"
#
# Choose your weapon: "alsa" (1 input/output), "pulseaudio" (multi input/output)
# or "jack" (multi input/output)
soundsystem
=
"
alsa
"
soundsystem
=
"
pulseaudio
"
##################################################################################################
# Input / Output
...
...
This diff is collapsed.
Click to expand it.
tests/mac-pulse-docker.sh
0 → 100644
+
5
−
0
View file @
7fd70146
#!/bin/bash
# Run some commands for testing - rm if done...
#
docker run
-it
-e
PULSE_SERVER
=
host.docker.internal
--mount
type
=
bind
,source
=
/Users/chris/.config/pulse,target
=
/home/pulseaudio/.config/pulse
--entrypoint
speaker-test
--rm
jess/pulseaudio
-c
2
-l
1
-t
wav
\ No newline at end of file
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment