Skip to content

Commit

Permalink
better docker solution #176
Browse files Browse the repository at this point in the history
  • Loading branch information
alireza0 committed Jul 18, 2024
1 parent 1631ac0 commit 2b6874a
Show file tree
Hide file tree
Showing 3 changed files with 46 additions and 4 deletions.
5 changes: 3 additions & 2 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM --platform=$BUILDPLATFORM node:alpine as front-builder
FROM --platform=$BUILDPLATFORM node:alpine AS front-builder
WORKDIR /app
COPY frontend/ ./
RUN npm install && npm run build
Expand All @@ -20,5 +20,6 @@ ENV TZ=Asia/Tehran
WORKDIR /app
RUN apk add --no-cache --update ca-certificates tzdata
COPY --from=backend-builder /app/sui /app/
COPY entrypoint.sh /app/
VOLUME [ "s-ui" ]
CMD [ "./sui" ]
ENTRYPOINT [ "./entrypoint.sh" ]
41 changes: 39 additions & 2 deletions docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ services:
- "singbox:/app/bin"
- "$PWD/db:/app/db"
- "$PWD/cert:/app/cert"
- "logs:/logs"
environment:
SINGBOX_API: "sing-box:1080"
SUI_DB_FOLDER: "db"
Expand All @@ -18,7 +19,16 @@ services:
- "2096:2096"
networks:
- s-ui
entrypoint: "./sui migrate && ./sui"
links:
- syslog
logging:
driver: syslog
options:
tag: "s-ui"
syslog-address: "udp://127.0.0.1:1514"
entrypoint: "./entrypoint.sh"
depends_on:
- syslog

sing-box:
image: alireza7/s-ui-singbox
Expand All @@ -34,12 +44,39 @@ services:
- "2443:2443"
- "3443:3443"
restart: unless-stopped
links:
- syslog
logging:
driver: syslog
options:
tag: "sing-box"
syslog-address: "udp://127.0.0.1:1514"
depends_on:
- s-ui
- syslog

syslog:
image: rsyslog/syslog_appliance_alpine
container_name: syslog
volumes:
- "logs:/logs"
networks:
- s-ui
ports:
- "127.0.0.1:1514:1514/udp"
restart: unless-stopped
environment:
- RSYSLOG_CONF_GLOBAL_CONF=template(name="RemoteLogs" type="string" string="/logs/%programname%.log")
- RSYSLOG_CONF_INPUT_UDP="input(type=\"imudp\" port=\"1514\" ruleset=\"remote\")"
- RSYSLOG_CONF_RULESET_REMOTE="ruleset(name=\"remote\") { action(type=\"omfile\" dynaFile=\"RemoteLogs\") }"
command: >
sh -c 'touch /config/container_config'
networks:
s-ui:
driver: bridge

volumes:
singbox:
logs:
singbox:

4 changes: 4 additions & 0 deletions entrypoint.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
#!/bin/sh

./sui migrate
./sui

0 comments on commit 2b6874a

Please sign in to comment.