Skip to content

Commit 9cd8d83

Browse files
committed
docker-compose => docker compose
1 parent cfb2e33 commit 9cd8d83

File tree

3 files changed

+18
-18
lines changed

3 files changed

+18
-18
lines changed

README.md

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -31,19 +31,19 @@ Test authorization through supplicant on Windows10, Android 4.4.4 and iOS 13.
3131

3232
- Setup database
3333

34-
start pg: `docker-compose -f docker-compose.yml up pg`
34+
start pg: `docker compose -f docker-compose.yml up pg`
3535

3636
init database and table data with [mysql_insert.sql](https://github.com/zeroleo12345/radius_server_python/blob/master/data/db/mysql_insert.sql)
3737

3838
- For authenticate
3939

4040
Build the docker image
4141

42-
`docker-compose build auth`
42+
`docker compose build auth`
4343

4444
Run the docker container
4545

46-
`docker-compose up auth`
46+
`docker compose up auth`
4747

4848
- For accouting
4949

@@ -55,7 +55,7 @@ Test authorization through supplicant on Windows10, Android 4.4.4 and iOS 13.
5555
### build lib `libhostapd.so` from project `hostapd`
5656

5757
```bash
58-
docker-compose exec auth bash
58+
docker compose exec auth bash
5959

6060
cd third_party/hostapd-2.10/hostapd/
6161
cat README.md
@@ -65,7 +65,7 @@ cat README.md
6565
### build simulator `eapol_test` from project `wpa_supplicant`
6666

6767
```bash
68-
docker-compose exec auth bash
68+
docker compose exec auth bash
6969

7070
cd third_party/wpa_supplicant-2.10/wpa_supplicant/
7171
cat README.md
@@ -76,7 +76,7 @@ cat README.md
7676
> `freeradius` not support `OpenSSL 3.0` well in debian `bookworm`
7777
7878
```bash
79-
docker-compose exec auth bash
79+
docker compose exec auth bash
8080

8181
cd third_party/freeradius-3.2.3/
8282
cat README.md
@@ -87,12 +87,12 @@ cat README.md
8787

8888
### Authenticate: `CHAP`
8989

90-
enter into authenticate container: `docker-compose exec auth bash`
90+
enter into authenticate container: `docker compose exec auth bash`
9191

9292
run simulator in container:
9393

9494
```bash
95-
docker-compose exec simulator bash
95+
docker compose exec simulator bash
9696

9797
radclient -D /app/tools/simulator/etc/dictionary -d /app/etc/dictionary auth:1812 auth 'testing123' < /app/tools/simulator/radius_test/auth/chap.conf
9898
```
@@ -102,7 +102,7 @@ radclient -D /app/tools/simulator/etc/dictionary -d /app/etc/dictionary auth:181
102102

103103
```bash
104104

105-
docker-compose exec simulator bash
105+
docker compose exec simulator bash
106106

107107
# docker run --rm -it --network pppoe_system_network_name jumanjiman/radclient:latest \
108108
radclient -D /app/tools/simulator/etc/dictionary -d /app/etc/dictionary auth:1812 auth 'testing123' < /app/tools/simulator/radius_test/auth/pap.conf
@@ -111,7 +111,7 @@ radclient -D /app/tools/simulator/etc/dictionary -d /app/etc/dictionary auth:181
111111

112112
### Authenticate: `MSCHAPv2`
113113

114-
1. `docker-compose up -d auth_test`, listen on port 2812
114+
1. `docker compose up -d auth_test`, listen on port 2812
115115

116116
2. Access Controller route traffic to 2812
117117

@@ -121,7 +121,7 @@ radclient -D /app/tools/simulator/etc/dictionary -d /app/etc/dictionary auth:181
121121

122122
add `USE_GTC=1` in .env and restart docker container
123123

124-
enter into authenticate container: `docker-compose exec auth bash`
124+
enter into authenticate container: `docker compose exec auth bash`
125125

126126
run simulator in container directory `/app/tools/simulator/bin`:
127127

@@ -134,7 +134,7 @@ eapol_test -c /app/tools/simulator/eap_test/eapol_test.conf.peapv1.gtc -a auth -
134134

135135
remove `USE_GTC=0` in .env and restart docker container
136136

137-
enter into authenticate container: `docker-compose exec auth bash`
137+
enter into authenticate container: `docker compose exec auth bash`
138138

139139
run simulator in container directory `/app/tools/simulator/bin`:
140140

@@ -146,7 +146,7 @@ run simulator in container directory `/app/tools/simulator/bin`:
146146
## Send `Accounting` request with simulator
147147

148148
```bash
149-
docker-compose exec simulator bash
149+
docker compose exec simulator bash
150150

151151
# i package
152152
radclient -D /app/tools/simulator/etc/dictionary -d /app/etc/dictionary acct:1813 acct 'testing123' < /app/tools/simulator/radius_test/acct/i.conf
@@ -163,12 +163,12 @@ radclient -D /app/tools/simulator/etc/dictionary -d /app/etc/dictionary acct:181
163163

164164
### disconnect
165165

166-
enter into accounting container: `docker-compose exec dae bash`
166+
enter into accounting container: `docker compose exec dae bash`
167167

168168
run simulator in container directory `/app/tools/simulator/bin`:
169169

170170
```bash
171-
docker-compose exec simulator bash
171+
docker compose exec simulator bash
172172

173173
radclient -D /app/tools/simulator/etc/dictionary -d /app/etc/dictionary dae:3799 disconnect 'testing123' < /app/tools/simulator/radius_test/dae/disconnect.conf
174174
```
@@ -182,7 +182,7 @@ gdb /root/.pyenv/shims/python -c core.1
182182

183183
## gdb segmentation fault
184184
```bash
185-
ENTRYPOINT="tail -f /dev/null" docker-compose up -d auth_test
185+
ENTRYPOINT="tail -f /dev/null" docker compose up -d auth_test
186186

187187
apt-get install gdb
188188

container/debug.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
#!/usr/bin/env sh
22

3-
export RESTART_POLICY=no; ENTRYPOINT="tail -f /dev/null" docker-compose up auth
3+
export RESTART_POLICY=no; ENTRYPOINT="tail -f /dev/null" docker compose up auth

container/stop.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
#!/usr/bin/env sh
22

3-
docker-compose stop auth acct dae
3+
docker compose stop auth acct dae

0 commit comments

Comments
 (0)