Skip to content

Commit d1a86b3

Browse files
authored
Added environment variables (#23)
1 parent b77ef0b commit d1a86b3

6 files changed

+17
-10
lines changed

src/Dockerfile.jinja

+3-1
Original file line numberDiff line numberDiff line change
@@ -86,10 +86,12 @@ SHELL ["/app/scripts/shell.sh"]
8686

8787
# Copy static files from build
8888
COPY --from=build /build/build/ build/
89+
# Copy package files
90+
COPY --from=build /build/package.json /build/package-lock.json ./
8991

9092
# Setup main entrypoint
9193
COPY scripts/entrypoint.sh scripts/entrypoint.sh
92-
ENTRYPOINT ["/app/scripts/entrypoint.sh", "caddy", "file-server", "--root", "build/", "--listen", ":{{ port }}", "--access-log"]
94+
ENTRYPOINT ["/app/scripts/entrypoint.sh", "npm", "run", "--", "run"]
9395
CMD []
9496

9597
# Setup ownership

src/Taskfile.dist.yaml.jinja

+4-7
Original file line numberDiff line numberDiff line change
@@ -244,13 +244,10 @@ tasks:
244244
vars:
245245
CLI_ARGS: ""
246246
- >
247-
caddy
248-
file-server
249-
--root
250-
build/
251-
--listen
252-
:{{ port }}
253-
--access-log
247+
npm
248+
run
249+
run
250+
--
254251
{{ '{{ .CLI_ARGS }}' }}
255252
docker:
256253
desc: Run in docker container

src/docker-compose.yaml.jinja

+3
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,7 @@ services:
33
build:
44
context: ./
55
network: host
6+
environment:
7+
- "{{ envprefix }}__SERVER__HOST=${ {{- envprefix }}__SERVER__HOST:-0.0.0.0}"
8+
- "{{ envprefix }}__SERVER__PORT=${ {{- envprefix }}__SERVER__PORT:-{{ port -}} }"
69
network_mode: host

src/flake.nix.jinja

+1
Original file line numberDiff line numberDiff line change
@@ -117,6 +117,7 @@
117117
name = "runtime";
118118

119119
packages = [
120+
node
120121
cacert
121122
tini
122123
su-exec

src/package.json.jinja

+1
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
"private": true,
44
"scripts": {
55
"dev": "vite",
6+
"run": "caddy file-server --root build/ --listen \"${ {{- envprefix }}__SERVER__HOST:-0.0.0.0}:${ {{- envprefix }}__SERVER__PORT:-{{ port -}} }\" --access-log",
67
"build": "tsc && vite build",
78
"clean": "rm --recursive --force build/",
89
"update": "ncu --peer --doctor --upgrade && npm i --no-audit --no-fund",

src/vite.config.mts.jinja

+5-2
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,10 @@ export default defineConfig({
88
},
99
plugins: [react()],
1010
server: {
11-
host: "0.0.0.0",
12-
port: {{ port }},
11+
host: process.env.{{ envprefix }}__SERVER__HOST || "0.0.0.0",
12+
port:
13+
process.env.{{ envprefix }}__SERVER__PORT === undefined
14+
? {{ port }}
15+
: parseInt(process.env.{{ envprefix }}__SERVER__PORT, 10),
1316
},
1417
});

0 commit comments

Comments
 (0)