Skip to content

Commit

Permalink
Configuration: We now support TOML, YAML, and JSON for configuration.…
Browse files Browse the repository at this point in the history 
… Please note that INI is deprecated and will be removed in future releases. New features will only be available in TOML, YAML, or JSON. Users wanting these new features should switch their configuration format accordingly. #2521
  • Loading branch information
@snowdream
snowdream committed Oct 13, 2023
1 parent ae3303b commit a7bab8c
Show file tree
Hide file tree
Showing 11 changed files with 22 additions and 22 deletions.
4 changes: 2 additions & 2 deletions README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,13 +14,13 @@ Docker Image packaging for Frp.
start frps

```bash
docker run --restart=always --network host -d -v /etc/frp/frps.ini:/etc/frp/frps.ini --name frps snowdreamtech/frps
docker run --restart=always --network host -d -v /etc/frp/frps.toml:/etc/frp/frps.toml --name frps snowdreamtech/frps
```

start frpc

```bash
docker run --restart=always --network host -d -v /etc/frp/frpc.ini:/etc/frp/frpc.ini --name frpc snowdreamtech/frpc
docker run --restart=always --network host -d -v /etc/frp/frpc.toml:/etc/frp/frpc.toml --name frpc snowdreamtech/frpc
```

## Quick reference
Expand Down
4 changes: 2 additions & 2 deletions frpc/amd64/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,9 @@ RUN cd /root \
&& cd frp_${FRP_VERSION}_linux_amd64/ \
&& cp frpc /usr/bin/ \
&& mkdir -p /etc/frp \
&& cp frpc.ini /etc/frp \
&& cp frpc.toml /etc/frp \
&& cd /root \
&& rm frp_${FRP_VERSION}_linux_amd64.tar.gz \
&& rm -rf frp_${FRP_VERSION}_linux_amd64/

ENTRYPOINT /usr/bin/frpc -c /etc/frp/frpc.ini
ENTRYPOINT /usr/bin/frpc -c /etc/frp/frpc.toml
4 changes: 2 additions & 2 deletions frpc/arm32v6/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,9 @@ RUN cd /root \
&& cd frp_${FRP_VERSION}_linux_arm/ \
&& cp frpc /usr/bin/ \
&& mkdir -p /etc/frp \
&& cp frpc.ini /etc/frp \
&& cp frpc.toml /etc/frp \
&& cd /root \
&& rm frp_${FRP_VERSION}_linux_arm.tar.gz \
&& rm -rf frp_${FRP_VERSION}_linux_arm/

ENTRYPOINT /usr/bin/frpc -c /etc/frp/frpc.ini
ENTRYPOINT /usr/bin/frpc -c /etc/frp/frpc.toml
4 changes: 2 additions & 2 deletions frpc/arm32v7/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,9 @@ RUN cd /root \
&& cd frp_${FRP_VERSION}_linux_arm/ \
&& cp frpc /usr/bin/ \
&& mkdir -p /etc/frp \
&& cp frpc.ini /etc/frp \
&& cp frpc.toml /etc/frp \
&& cd /root \
&& rm frp_${FRP_VERSION}_linux_arm.tar.gz \
&& rm -rf frp_${FRP_VERSION}_linux_arm/

ENTRYPOINT /usr/bin/frpc -c /etc/frp/frpc.ini
ENTRYPOINT /usr/bin/frpc -c /etc/frp/frpc.toml
4 changes: 2 additions & 2 deletions frpc/arm64v8/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,9 @@ RUN cd /root \
&& cd frp_${FRP_VERSION}_linux_arm64/ \
&& cp frpc /usr/bin/ \
&& mkdir -p /etc/frp \
&& cp frpc.ini /etc/frp \
&& cp frpc.toml /etc/frp \
&& cd /root \
&& rm frp_${FRP_VERSION}_linux_arm64.tar.gz \
&& rm -rf frp_${FRP_VERSION}_linux_arm64/

ENTRYPOINT /usr/bin/frpc -c /etc/frp/frpc.ini
ENTRYPOINT /usr/bin/frpc -c /etc/frp/frpc.toml
4 changes: 2 additions & 2 deletions frpc/i386/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,9 @@ RUN cd /root \
&& cd frp_${FRP_VERSION}_linux_386/ \
&& cp frpc /usr/bin/ \
&& mkdir -p /etc/frp \
&& cp frpc.ini /etc/frp \
&& cp frpc.toml /etc/frp \
&& cd /root \
&& rm frp_${FRP_VERSION}_linux_386.tar.gz \
&& rm -rf frp_${FRP_VERSION}_linux_386/

ENTRYPOINT /usr/bin/frpc -c /etc/frp/frpc.ini
ENTRYPOINT /usr/bin/frpc -c /etc/frp/frpc.toml
4 changes: 2 additions & 2 deletions frps/amd64/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,9 @@ RUN cd /root \
&& cd frp_${FRP_VERSION}_linux_amd64/ \
&& cp frps /usr/bin/ \
&& mkdir -p /etc/frp \
&& cp frps.ini /etc/frp \
&& cp frps.toml /etc/frp \
&& cd /root \
&& rm frp_${FRP_VERSION}_linux_amd64.tar.gz \
&& rm -rf frp_${FRP_VERSION}_linux_amd64/

ENTRYPOINT /usr/bin/frps -c /etc/frp/frps.ini
ENTRYPOINT /usr/bin/frps -c /etc/frp/frps.toml
4 changes: 2 additions & 2 deletions frps/arm32v6/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,9 @@ RUN cd /root \
&& cd frp_${FRP_VERSION}_linux_arm/ \
&& cp frps /usr/bin/ \
&& mkdir -p /etc/frp \
&& cp frps.ini /etc/frp \
&& cp frps.toml /etc/frp \
&& cd /root \
&& rm frp_${FRP_VERSION}_linux_arm.tar.gz \
&& rm -rf frp_${FRP_VERSION}_linux_arm/

ENTRYPOINT /usr/bin/frps -c /etc/frp/frps.ini
ENTRYPOINT /usr/bin/frps -c /etc/frp/frps.toml
4 changes: 2 additions & 2 deletions frps/arm32v7/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,9 @@ RUN cd /root \
&& cd frp_${FRP_VERSION}_linux_arm/ \
&& cp frps /usr/bin/ \
&& mkdir -p /etc/frp \
&& cp frps.ini /etc/frp \
&& cp frps.toml /etc/frp \
&& cd /root \
&& rm frp_${FRP_VERSION}_linux_arm.tar.gz \
&& rm -rf frp_${FRP_VERSION}_linux_arm/

ENTRYPOINT /usr/bin/frps -c /etc/frp/frps.ini
ENTRYPOINT /usr/bin/frps -c /etc/frp/frps.toml
4 changes: 2 additions & 2 deletions frps/arm64v8/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,9 @@ RUN cd /root \
&& cd frp_${FRP_VERSION}_linux_arm64/ \
&& cp frps /usr/bin/ \
&& mkdir -p /etc/frp \
&& cp frps.ini /etc/frp \
&& cp frps.toml /etc/frp \
&& cd /root \
&& rm frp_${FRP_VERSION}_linux_arm64.tar.gz \
&& rm -rf frp_${FRP_VERSION}_linux_arm64/

ENTRYPOINT /usr/bin/frps -c /etc/frp/frps.ini
ENTRYPOINT /usr/bin/frps -c /etc/frp/frps.toml
4 changes: 2 additions & 2 deletions frps/i386/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,9 @@ RUN cd /root \
&& cd frp_${FRP_VERSION}_linux_386/ \
&& cp frps /usr/bin/ \
&& mkdir -p /etc/frp \
&& cp frps.ini /etc/frp \
&& cp frps.toml /etc/frp \
&& cd /root \
&& rm frp_${FRP_VERSION}_linux_386.tar.gz \
&& rm -rf frp_${FRP_VERSION}_linux_386/

ENTRYPOINT /usr/bin/frps -c /etc/frp/frps.ini
ENTRYPOINT /usr/bin/frps -c /etc/frp/frps.toml

0 comments on commit a7bab8c

Please sign in to comment.