Update Dockerfile
Browse files- Dockerfile +8 -11
Dockerfile
CHANGED
|
@@ -1,17 +1,13 @@
|
|
| 1 |
-
FROM
|
| 2 |
|
| 3 |
-
# Установка
|
| 4 |
RUN apt-get update && apt-get install -y \
|
| 5 |
curl \
|
| 6 |
gnupg \
|
| 7 |
ca-certificates \
|
|
|
|
| 8 |
&& rm -rf /var/lib/apt/lists/*
|
| 9 |
|
| 10 |
-
# Установка Node.js 20.x
|
| 11 |
-
RUN curl -fsSL https://deb.nodesource.com/setup_20.x | bash - \
|
| 12 |
-
&& apt-get install -y nodejs
|
| 13 |
-
|
| 14 |
-
# Установка Cloudflare Warp
|
| 15 |
RUN curl https://pkg.cloudflareclient.com/pubkey.gpg | gpg --yes --dearmor --output /usr/share/keyrings/cloudflare-warp-archive-keyring.gpg
|
| 16 |
RUN echo "deb [arch=amd64 signed-by=/usr/share/keyrings/cloudflare-warp-archive-keyring.gpg] https://pkg.cloudflareclient.com/ $(lsb_release -cs) main" | tee /etc/apt/sources.list.d/cloudflare-client.list
|
| 17 |
RUN apt-get update && apt-get install -y cloudflare-warp
|
|
@@ -19,13 +15,12 @@ RUN apt-get update && apt-get install -y cloudflare-warp
|
|
| 19 |
# Создание директории приложения
|
| 20 |
WORKDIR /app
|
| 21 |
|
| 22 |
-
#
|
| 23 |
RUN echo '{"name":"warp-express","version":"1.0.0","dependencies":{"express":"^4.18.2","axios":"^1.7.2","socks-proxy-agent":"^8.0.4"}}' > package.json
|
| 24 |
|
| 25 |
# Установка зависимостей
|
| 26 |
RUN npm install
|
| 27 |
|
| 28 |
-
# Создаем файл приложения
|
| 29 |
RUN echo "const express = require('express');" > app.js \
|
| 30 |
&& echo "const axios = require('axios');" >> app.js \
|
| 31 |
&& echo "const SocksProxyAgent = require('socks-proxy-agent');" >> app.js \
|
|
@@ -50,7 +45,7 @@ RUN warp-cli register && \
|
|
| 50 |
warp-cli set-mode proxy && \
|
| 51 |
warp-cli set-proxy-port 24000
|
| 52 |
|
| 53 |
-
# Скрипт
|
| 54 |
RUN echo '#!/bin/bash' > /entrypoint.sh \
|
| 55 |
&& echo 'warp-cli connect' >> /entrypoint.sh \
|
| 56 |
&& echo 'while true; do' >> /entrypoint.sh \
|
|
@@ -62,6 +57,8 @@ RUN echo '#!/bin/bash' > /entrypoint.sh \
|
|
| 62 |
&& echo 'node app.js' >> /entrypoint.sh \
|
| 63 |
&& chmod +x /entrypoint.sh
|
| 64 |
|
| 65 |
-
# Открываем порт
|
| 66 |
EXPOSE 7860
|
|
|
|
|
|
|
| 67 |
CMD ["/bin/bash", "/entrypoint.sh"]
|
|
|
|
| 1 |
+
FROM node:20-bookworm
|
| 2 |
|
| 3 |
+
# Установка Cloudflare Warp
|
| 4 |
RUN apt-get update && apt-get install -y \
|
| 5 |
curl \
|
| 6 |
gnupg \
|
| 7 |
ca-certificates \
|
| 8 |
+
lsb-release \
|
| 9 |
&& rm -rf /var/lib/apt/lists/*
|
| 10 |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 11 |
RUN curl https://pkg.cloudflareclient.com/pubkey.gpg | gpg --yes --dearmor --output /usr/share/keyrings/cloudflare-warp-archive-keyring.gpg
|
| 12 |
RUN echo "deb [arch=amd64 signed-by=/usr/share/keyrings/cloudflare-warp-archive-keyring.gpg] https://pkg.cloudflareclient.com/ $(lsb_release -cs) main" | tee /etc/apt/sources.list.d/cloudflare-client.list
|
| 13 |
RUN apt-get update && apt-get install -y cloudflare-warp
|
|
|
|
| 15 |
# Создание директории приложения
|
| 16 |
WORKDIR /app
|
| 17 |
|
| 18 |
+
# Создаем package.json и app.js
|
| 19 |
RUN echo '{"name":"warp-express","version":"1.0.0","dependencies":{"express":"^4.18.2","axios":"^1.7.2","socks-proxy-agent":"^8.0.4"}}' > package.json
|
| 20 |
|
| 21 |
# Установка зависимостей
|
| 22 |
RUN npm install
|
| 23 |
|
|
|
|
| 24 |
RUN echo "const express = require('express');" > app.js \
|
| 25 |
&& echo "const axios = require('axios');" >> app.js \
|
| 26 |
&& echo "const SocksProxyAgent = require('socks-proxy-agent');" >> app.js \
|
|
|
|
| 45 |
warp-cli set-mode proxy && \
|
| 46 |
warp-cli set-proxy-port 24000
|
| 47 |
|
| 48 |
+
# Скрипт запуска
|
| 49 |
RUN echo '#!/bin/bash' > /entrypoint.sh \
|
| 50 |
&& echo 'warp-cli connect' >> /entrypoint.sh \
|
| 51 |
&& echo 'while true; do' >> /entrypoint.sh \
|
|
|
|
| 57 |
&& echo 'node app.js' >> /entrypoint.sh \
|
| 58 |
&& chmod +x /entrypoint.sh
|
| 59 |
|
| 60 |
+
# Открываем порт
|
| 61 |
EXPOSE 7860
|
| 62 |
+
|
| 63 |
+
# Запускаем
|
| 64 |
CMD ["/bin/bash", "/entrypoint.sh"]
|