Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Updates #126

Merged
merged 1 commit into from
Aug 8, 2024
Merged

Updates #126

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
# docker run -v $(pwd):/usr/src/app -e DISPLAY=$DISPLAY -it --network=host -v /tmp/.X11-unix:/tmp/.X11-unix -e PULSE_SERVER=unix:${XDG_RUNTIME_DIR}/pulse/native -v ${XDG_RUNTIME_DIR}/pulse/native:${XDG_RUNTIME_DIR}/pulse/native -v /run/dbus:/run/dbus --device /dev/snd beamformer bash
#

FROM ubuntu:22.04 AS deps
FROM ubuntu:22.04

ENV TZ=Europe \
DEBIAN_FRONTEND=noninteractive \
Expand Down Expand Up @@ -71,8 +71,6 @@ RUN git submodule init \
&& cmake -Bbuild -H. -DPAHO_WITH_MQTT_C=ON -DPAHO_WITH_SSL=ON \
&& cmake --build build/ --target install

FROM deps AS build

WORKDIR /
RUN git clone https://github.com/acoustic-warfare/WARA-PS-MQTT-Agent.git
WORKDIR /WARA-PS-MQTT-Agent
Expand Down Expand Up @@ -100,4 +98,6 @@ WORKDIR /usr/src/app

# Add configs for sound and start pulse audio
COPY src/audio/daemon.conf /etc/pulse/daemon.conf
RUN pulseaudio --start
RUN pulseaudio --start

RUN mkdir -p build && cd build && cmake .. && make