mirror of
https://github.com/wireadmin/wireadmin
synced 2025-04-03 04:20:45 +00:00
(chore): revert to nodejs and update dependencies
This commit is contained in:
Shahrad Elahi
parent
fc0e423f07
commit
5095de22f8
12
Dockerfile
12
Dockerfile
@ -1,6 +1,6 @@
|
||||
FROM oven/bun:alpine as base
|
||||
LABEL Maintainer="Shahrad Elahi <https://github.com/shahradelahi>"
|
||||
WORKDIR /usr/src/app
|
||||
WORKDIR /app
|
||||
|
||||
ENV TZ=UTC
|
||||
RUN ln -snf /usr/share/zoneinfo/$TZ /etc/localtime && echo $TZ > /etc/timezone
|
||||
@ -8,6 +8,8 @@ RUN ln -snf /usr/share/zoneinfo/$TZ /etc/localtime && echo $TZ > /etc/timezone
|
||||
COPY --from=chriswayg/tor-alpine:latest /usr/local/bin/obfs4proxy /usr/local/bin/obfs4proxy
|
||||
COPY --from=chriswayg/tor-alpine:latest /usr/local/bin/meek-server /usr/local/bin/meek-server
|
||||
|
||||
COPY /config/torrc /etc/tor/torrc
|
||||
|
||||
# Set the mirror list
|
||||
RUN echo "https://uk.alpinelinux.org/alpine/latest-stable/main" > /etc/apk/repositories && \
|
||||
echo "https://mirror.bardia.tech/alpine/latest-stable/main" >> /etc/apk/repositories && \
|
||||
@ -54,11 +56,15 @@ RUN bun run build
|
||||
FROM base AS release
|
||||
|
||||
COPY --from=deps /temp/prod/node_modules node_modules
|
||||
COPY --from=build /usr/src/app/build .
|
||||
COPY --from=build /usr/src/app/package.json .
|
||||
COPY --from=build /app/build .
|
||||
COPY --from=build /app/package.json .
|
||||
|
||||
ENV NODE_ENV=production
|
||||
|
||||
COPY docker-entrypoint.sh /usr/bin/entrypoint
|
||||
RUN chmod +x /usr/bin/entrypoint
|
||||
ENTRYPOINT ["/usr/bin/entrypoint"]
|
||||
|
||||
# run the app
|
||||
USER bun
|
||||
EXPOSE 3000/tcp
|
||||
|
||||
@ -1,13 +1,19 @@
|
||||
FROM oven/bun:alpine as base
|
||||
FROM node:alpine as base
|
||||
LABEL Maintainer="Shahrad Elahi <https://github.com/shahradelahi>"
|
||||
WORKDIR /usr/src/app
|
||||
WORKDIR /app
|
||||
|
||||
ENV TZ=UTC
|
||||
RUN ln -snf /usr/share/zoneinfo/$TZ /etc/localtime && echo $TZ > /etc/timezone
|
||||
|
||||
ENV PNPM_HOME="/pnpm"
|
||||
ENV PATH="$PNPM_HOME:$PATH"
|
||||
RUN corepack enable
|
||||
|
||||
COPY --from=chriswayg/tor-alpine:latest /usr/local/bin/obfs4proxy /usr/local/bin/obfs4proxy
|
||||
COPY --from=chriswayg/tor-alpine:latest /usr/local/bin/meek-server /usr/local/bin/meek-server
|
||||
|
||||
COPY /config/torrc /etc/tor/torrc
|
||||
|
||||
# Set the mirror list
|
||||
RUN echo "https://uk.alpinelinux.org/alpine/latest-stable/main" > /etc/apk/repositories && \
|
||||
echo "https://mirror.bardia.tech/alpine/latest-stable/main" >> /etc/apk/repositories && \
|
||||
@ -33,16 +39,20 @@ RUN rm -rf /var/cache/apk/*
|
||||
|
||||
FROM base AS deps
|
||||
|
||||
RUN mkdir -p /temp/dev
|
||||
COPY web/package.json web/bun.lockb web/node_modules* /temp/dev/
|
||||
RUN cd /temp/dev && bun install --frozen-lockfile
|
||||
RUN mkdir -p /temp/dev/
|
||||
|
||||
COPY web/package.json web/pnpm-lock.yaml /temp/dev/
|
||||
RUN --mount=type=cache,id=pnpm,target=/pnpm/store pnpm install --frozen-lockfile -C /temp/dev/
|
||||
|
||||
|
||||
FROM base AS runner
|
||||
|
||||
COPY --from=deps /temp/dev/node_modules node_modules
|
||||
COPY web .
|
||||
|
||||
COPY docker-entrypoint.sh /usr/bin/entrypoint
|
||||
RUN chmod +x /usr/bin/entrypoint
|
||||
ENTRYPOINT ["/usr/bin/entrypoint"]
|
||||
|
||||
# run the appc
|
||||
EXPOSE 5173/tcp
|
||||
CMD [ "bun", "dev", "--host" ]
|
||||
CMD [ "npm", "run", "dev", "--", "--host" ]
|
||||
@ -44,7 +44,7 @@ docker run -d \
|
||||
--cap-add=SYS_MODULE \
|
||||
--sysctl="net.ipv4.conf.all.src_valid_mark=1" \
|
||||
--sysctl="net.ipv4.ip_forward=1" \
|
||||
ghcr.io/shahradelahi/wireadmin
|
||||
ghcr.io/shahradelahi/wireadmin:latest
|
||||
```
|
||||
|
||||
Please note that the port `3000` is for the UI and it is up to you to remove it after configuring the Servers/Peers.
|
||||
|
||||
@ -3,7 +3,7 @@ services:
|
||||
wireadmin:
|
||||
image: wireadmin
|
||||
volumes:
|
||||
- ./web/:/usr/src/app/
|
||||
- ./web/:/app/
|
||||
ports:
|
||||
- "5173:5173"
|
||||
environment:
|
||||
|
||||
@ -43,7 +43,7 @@ fi
|
||||
|
||||
# Checking if there is `UI_PASSWORD` environment variable
|
||||
# if there was, converting it to hex and storing it to
|
||||
# the .env.local
|
||||
# the .env
|
||||
if [ -n "$UI_PASSWORD" ]; then
|
||||
ui_password_hex=$(echo -n "$UI_PASSWORD" | xxd -ps -u)
|
||||
sed -e '/^HASHED_PASSWORD=/d' /app/.env
|
||||
@ -53,7 +53,7 @@ EOF
|
||||
unset UI_PASSWORD
|
||||
fi
|
||||
|
||||
remove_duplicate_env "/app/.env.local"
|
||||
remove_duplicate_env "/app/.env"
|
||||
|
||||
# IP address of the container
|
||||
inet_address="$(hostname -i | awk '{print $1}')"
|
||||
@ -86,6 +86,7 @@ screen -L -Logfile /var/vlogs/tor -dmS tor bash -c "tor -f /etc/tor/torrc"
|
||||
# Starting Redis server in detached mode
|
||||
screen -L -Logfile /var/vlogs/redis -dmS redis bash -c "redis-server --port 6479 --daemonize no --dir /data --appendonly yes"
|
||||
|
||||
echo " "
|
||||
echo " _ ___ ___ __ _ "
|
||||
echo "| | / (_)_______ / | ____/ /___ ___ (_)___ "
|
||||
echo "| | /| / / / ___/ _ \/ /| |/ __ / __ \`__ \/ / __ \\"
|
||||
|
||||
BIN
web/bun.lockb
BIN
web/bun.lockb
Binary file not shown.
@ -14,29 +14,34 @@
|
||||
"start": "bun ./build/index.js"
|
||||
},
|
||||
"devDependencies": {
|
||||
"@sveltejs/adapter-auto": "^2.0.0",
|
||||
"@sveltejs/kit": "^1.20.4",
|
||||
"@sveltejs/adapter-auto": "^2.1.1",
|
||||
"@sveltejs/kit": "^1.27.3",
|
||||
"@types/crypto-js": "^4.1.3",
|
||||
"@types/jsonwebtoken": "^9.0.4",
|
||||
"autoprefixer": "^10.4.14",
|
||||
"postcss": "^8.4.24",
|
||||
"@types/node": "^20.8.10",
|
||||
"autoprefixer": "^10.4.16",
|
||||
"postcss": "^8.4.31",
|
||||
"postcss-load-config": "^4.0.1",
|
||||
"prettier": "^2.8.0",
|
||||
"prettier-plugin-svelte": "^2.10.1",
|
||||
"svelte": "^4.0.5",
|
||||
"svelte-check": "^3.4.3",
|
||||
"prettier": "^3.0.3",
|
||||
"prettier-plugin-svelte": "^3.0.3",
|
||||
"svelte": "^4.2.2",
|
||||
"svelte-check": "^3.5.2",
|
||||
"sveltekit-superforms": "^1.9.0",
|
||||
"tailwindcss": "^3.3.2",
|
||||
"tslib": "^2.4.1",
|
||||
"typescript": "^5.0.0",
|
||||
"vite": "^4.4.2",
|
||||
"vitest": "^0.34.0",
|
||||
"tailwindcss": "^3.3.5",
|
||||
"tslib": "^2.6.2",
|
||||
"typescript": "^5.2.2",
|
||||
"vite": "^4.5.0",
|
||||
"vitest": "^0.34.6",
|
||||
"zod": "^3.22.4"
|
||||
},
|
||||
"type": "module",
|
||||
"dependencies": {
|
||||
"bits-ui": "^0.9.0",
|
||||
"clsx": "^2.0.0",
|
||||
"crypto-js": "^4.2.0",
|
||||
"deepmerge": "^4.3.1",
|
||||
"formsnap": "^0.4.1",
|
||||
"ioredis": "^5.3.2",
|
||||
"jsonwebtoken": "^9.0.2",
|
||||
"lucide-svelte": "^0.292.0",
|
||||
"tailwind-merge": "^2.0.0",
|
||||
|
||||
1981
web/pnpm-lock.yaml
Normal file
1981
web/pnpm-lock.yaml
Normal file
File diff suppressed because it is too large
Load Diff
@ -6,7 +6,7 @@
|
||||
<meta name="viewport" content="width=device-width, initial-scale=1" />
|
||||
%sveltekit.head%
|
||||
</head>
|
||||
<body data-sveltekit-preload-data="hover">
|
||||
<div style="display: contents">%sveltekit.body%</div>
|
||||
<body data-sveltekit-preload-data="hover" class="min-h-screen">
|
||||
<div style="display: contents" class="min-h-screen">%sveltekit.body%</div>
|
||||
</body>
|
||||
</html>
|
||||
|
||||
Loading…
Reference in New Issue
Block a user