Skip to content

Commit bd1eda4

Browse files
committed
combine nuxt and alsa images
1 parent 393cb13 commit bd1eda4

4 files changed

Lines changed: 60 additions & 62 deletions

File tree

Dockerfile

Lines changed: 53 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,51 @@
1-
FROM oven/bun:slim AS base
1+
FROM oven/bun:debian AS base
22
WORKDIR /home/bun/app/
33

4+
FROM base AS runtime
5+
RUN sed -i 's/main/main non-free/' /etc/apt/sources.list
6+
RUN apt-get update && apt-get install -y \
7+
build-essential \
8+
git \
9+
autoconf \
10+
automake \
11+
libtool \
12+
make \
13+
gcc \
14+
libc-dev \
15+
libasound2-dev \
16+
libbluetooth-dev \
17+
libdbus-1-dev \
18+
libsbc-dev \
19+
libfdk-aac-dev \
20+
libmp3lame-dev \
21+
libopus-dev \
22+
libsamplerate0-dev \
23+
libspandsp-dev \
24+
libreadline-dev \
25+
libconfig-dev \
26+
libortp-dev \
27+
libmpg123-dev \
28+
libopenaptx-dev \
29+
libldacbt-abr-dev \
30+
libldacbt-enc-dev \
31+
libglib2.0-dev \
32+
dbus \
33+
screen \
34+
alsa-utils \
35+
&& apt-get clean
36+
37+
RUN git clone https://github.com/Arkq/bluez-alsa.git /bluez-alsa && \
38+
cd /bluez-alsa && \
39+
autoreconf --install && \
40+
mkdir build && \
41+
cd build && \
42+
../configure --enable-aac --enable-ofono --enable-debug && \
43+
make && \
44+
make install
45+
46+
ENV LIBASOUND_THREAD_SAFE=0
47+
ENV LD_LIBRARY_PATH=/usr/local/lib
48+
449
FROM base AS install
550
RUN mkdir -p /temp/dep/
651
COPY package.json bun.lock /temp/dep/
@@ -10,10 +55,12 @@ FROM base AS build
1055
COPY --from=install /temp/dep/node_modules/ node_modules/
1156
COPY . .
1257
ENV NODE_ENV=production
13-
RUN bun run generate
58+
RUN bun run build
1459

15-
FROM base
60+
FROM runtime
1661
COPY --from=build /home/bun/app/.output .output/
17-
RUN bun install --global serve
18-
RUN echo '{"directoryListing":false}' > .output/public/serve.json
19-
CMD ["bun", "x", "serve", "--no-port-switching", "-p", "3000", "--no-request-logging", ".output/public"]
62+
63+
# screen bluealsad -p a2dp-sink
64+
# screen bluealsa-aplay --pcm=default:CARD=Headphones --volume=software
65+
66+
CMD ["bun", "run", ".output/server/index.mjs"]

docker/bordkuchen/Dockerfile

Lines changed: 0 additions & 55 deletions
This file was deleted.

docker/run.sh

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
#!/bin/bash
2+
3+
sudo docker run --rm --privileged --net=host \
4+
--device=/dev/snd --device=/dev/bus/usb \
5+
-v /var/run/dbus/system_bus_socket:/var/run/dbus/system_bus_socket \
6+
--name bordmonitor fortnet-dev/bordmonitor

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
"lint": "eslint .",
1212
"preview": "nuxt preview",
1313
"docker:build": "docker build -t fortnet-dev/bordmonitor .",
14-
"docker:run": "docker run --rm -p 3000:3000 fortnet-dev/bordmonitor"
14+
"docker:run": "./docker/run.sh"
1515
},
1616
"dependencies": {
1717
"@acab/reset.css": "^0.11.0",

0 commit comments

Comments
 (0)