Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 7 additions & 5 deletions .github/workflows/build-and-push.yml
Original file line number Diff line number Diff line change
Expand Up @@ -30,18 +30,20 @@ jobs:
strategy:
matrix:
image:
- name: 'Main Image'
- name: 'Core Latest'
tags: |
remnawave/node:latest
remnawave/node:${{github.ref_name}}
ghcr.io/remnawave/node:latest
ghcr.io/remnawave/node:${{github.ref_name}}
build_args: ''
- name: 'SNI Image'
- name: 'Core v25.6.8'
tags: |
remnawave/node:sni-latest
remnawave/node:sni-${{github.ref_name}}
build_args: 'UPSTREAM_REPO=kastov'
remnawave/node:xray-v25.6.8-latest
remnawave/node:xray-v25.6.8-${{github.ref_name}}
ghcr.io/remnawave/node:xray-v25.6.8-latest
ghcr.io/remnawave/node:xray-v25.6.8-${{github.ref_name}}
build_args: 'XRAY_CORE_VERSION=v25.6.8'
steps:
- name: Checkout
uses: actions/checkout@v3
Expand Down
10 changes: 1 addition & 9 deletions .github/workflows/build-dev.yml
Original file line number Diff line number Diff line change
Expand Up @@ -29,18 +29,10 @@ jobs:
strategy:
matrix:
image:
- name: 'Main Image'
- name: 'Dev Image'
tag: 'remnawave/node:dev'
dockerfile: 'Dockerfile'
build_args: ''
- name: 'SNI Image'
tag: 'remnawave/node:sni-dev'
dockerfile: 'Dockerfile'
build_args: 'UPSTREAM_REPO=kastov'
- name: 'Bun Image'
tag: 'remnawave/node:bun-dev'
dockerfile: 'Dockerfile.Bun'
build_args: ''
steps:
- name: Checkout
uses: actions/checkout@v3
Expand Down
85 changes: 0 additions & 85 deletions .old.eslintrc.js

This file was deleted.

7 changes: 7 additions & 0 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,13 @@ RUN mkdir -p /var/log/supervisor
WORKDIR /opt/app
COPY --from=build /opt/app/dist ./dist

RUN echo '#!/bin/bash' > /usr/local/bin/xlogs \
&& echo 'tail -n +1 -f /var/log/supervisor/xray.out.log' >> /usr/local/bin/xlogs \
&& chmod +x /usr/local/bin/xlogs

RUN echo '#!/bin/bash' > /usr/local/bin/xerrors \
&& echo 'tail -n +1 -f /var/log/supervisor/xray.err.log' >> /usr/local/bin/xerrors \
&& chmod +x /usr/local/bin/xerrors

RUN apk add --no-cache \
curl \
Expand Down
File renamed without changes.
File renamed without changes.
2 changes: 1 addition & 1 deletion docker-compose-dev.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ services:
remnawave-node-dev:
build:
context: .
dockerfile: Dockerfile.dev
dockerfile: dev.Dockerfile
container_name: remnawave-node-dev
hostname: remnawave-node-dev
networks:
Expand Down
11 changes: 8 additions & 3 deletions docker-entrypoint.sh
Original file line number Diff line number Diff line change
@@ -1,8 +1,13 @@
#!/bin/sh

echo "Starting entrypoint script..."
echo "[Entrypoint] Starting entrypoint script..."
supervisord -c /etc/supervisord.conf &
echo "Supervisord started"
echo "[Entrypoint] Supervisord started successfully"
sleep 1
echo "Executing: $@"
echo "[Entrypoint] Getting Xray version..."
XRAY_CORE_VERSION=$(/usr/local/bin/xray version | head -n 1)
export XRAY_CORE_VERSION
echo "[Entrypoint] Xray version: $XRAY_CORE_VERSION"

echo "[Entrypoint] Executing command: $@"
exec "$@"
1 change: 1 addition & 0 deletions libs/contract/constants/headers/headers.contants.ts
Original file line number Diff line number Diff line change
@@ -1 +1,2 @@
export const X_HASH_PAYLOAD = 'X-Hash-Payload';
export const X_FORCE_RESTART = 'X-Force-Restart';
2 changes: 1 addition & 1 deletion libs/contract/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@remnawave/node-contract",
"version": "0.5.8",
"version": "0.5.9",
"description": "A node-contract library for Remnawave Panel",
"main": "build/index.js",
"types": "build/index.d.ts",
Expand Down
Loading