Skip to content

Commit ee44527

Browse files
authored
Merge pull request #34 from byrdsandbytes/feature/caddy-test
Feature/caddy test
2 parents 58b4400 + 11abbd8 commit ee44527

File tree

6 files changed

+24
-8
lines changed

6 files changed

+24
-8
lines changed

Caddyfile

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
:80 {
2+
root * /usr/share/caddy
3+
try_files {path} /index.html
4+
file_server
5+
}
6+
7+
beatnik.local, beatnik-server.local, localhost, 127.0.0.1, ::1, :443 {
8+
root * /usr/share/caddy
9+
try_files {path} /index.html
10+
file_server
11+
tls internal
12+
}

Dockerfile

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,9 @@ RUN npm ci
66
COPY . .
77
RUN npm run build
88

9-
# Stage 2: Serve the application from a lightweight Nginx server
10-
FROM nginx:alpine
11-
COPY --from=build /usr/src/app/www /usr/share/nginx/html
9+
# Stage 2: Serve the application from a lightweight Caddy server
10+
FROM caddy:alpine
11+
COPY Caddyfile /etc/caddy/Caddyfile
12+
COPY --from=build /usr/src/app/www /usr/share/caddy
1213
EXPOSE 80
14+
EXPOSE 443

docker-compose.build.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,5 @@ services:
33
build: .
44
container_name: beatnik-controller-local
55
ports:
6-
- "8181:80"
6+
- "80:80"
7+
- "8443:443"

docker-compose.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,5 @@ services:
33
image: ghcr.io/byrdsandbytes/beatnik-controller:latest
44
container_name: beatnik-controller
55
ports:
6-
- "8181:80"
6+
- "80:80"
7+
- "8443:443"

package-lock.json

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "beatnik",
3-
"version": "0.4.1",
3+
"version": "0.4.2",
44
"author": "byrds & bytes gmbh",
55
"homepage": "https://beatnik.audio",
66
"scripts": {

0 commit comments

Comments
 (0)