Skip to content

WIP: Docker support #15

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
m2kar wants to merge 6 commits into
base: master
Choose a base branch
from
Open

WIP: Docker support #15

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
538ca20
Create Dockerfile
m2kar Jun 20, 2020
aee713b
change systemctl nginx to /etc/init.d/nginx
m2kar Jun 20, 2020
8ebd004
Update Dockerfile
m2kar Jun 20, 2020
688786e
Update Dockerfile
m2kar Jun 20, 2020
07d927f
Update Dockerfile
m2kar Jun 20, 2020
cb0e79b
Update Dockerfile
m2kar Jun 20, 2020
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
5 changes: 5 additions & 0 deletions Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
FROM ubuntu:18.04
ARG $DOMAIN
RUN apt-get install -y wget curl xz-utils systemd iputils-ping cron socat nginx unzip zip tar apt-get install -y ca-certificates \
&& printf "1\n$DOMAIN\n" | bash <(curl -s -L https://github.com/m2kar/Trojan/raw/master/Trojan.sh)
CMD ["/usr/src/trojan/trojan", "-c", "/usr/src/trojan/server.conf"]
4 changes: 2 additions & 2 deletions Trojan.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -151,7 +151,7 @@ EOF
cd /usr/share/nginx/html/
wget https://github.com/V2RaySSR/Trojan/raw/master/web.zip
unzip web.zip
systemctl restart nginx.service
/etc/init.d/nginx restart
#申请https证书
mkdir /usr/src/trojan-cert
curl https://get.acme.sh | sh
Expand Down Expand Up @@ -366,4 +366,4 @@ start_menu(){
esac
}

start_menu
start_menu