File tree Expand file tree Collapse file tree
src/shadowbox/integration_test Expand file tree Collapse file tree Original file line number Diff line number Diff line change @@ -100,13 +100,10 @@ function setup() {
100100 " ${DOCKER} " run -d --rm -p " 10080:80" --network=" ${NET_OPEN} " --network-alias=" target" --name=" ${TARGET_CONTAINER} " " ${TARGET_IMAGE} "
101101
102102 # Shadowsocks service.
103- # Start on NET_OPEN first so that -p host port binding works on macOS Docker Desktop
104- # (Docker Desktop does not publish ports when the initial network is --internal).
105- # Then connect to NET_BLOCKED so the security isolation tests still pass.
106103 declare -ar shadowbox_flags=(
107104 -d
108105 --rm
109- --network=" ${NET_OPEN } "
106+ --network=" ${NET_BLOCKED } "
110107 --network-alias=" shadowbox"
111108 -p " 20443:443"
112109 -e " SB_API_PORT=443"
@@ -121,7 +118,8 @@ function setup() {
121118 " ${SHADOWBOX_IMAGE} "
122119 )
123120 " ${DOCKER} " run " ${shadowbox_flags[@]} "
124- " ${DOCKER} " network connect --alias shadowbox " ${NET_BLOCKED} " " ${SHADOWBOX_CONTAINER} "
121+ # "${DOCKER}" network connect --alias shadowbox "${NET_BLOCKED}" "${SHADOWBOX_CONTAINER}"
122+ " ${DOCKER} " network connect " ${NET_OPEN} " " ${SHADOWBOX_CONTAINER} "
125123
126124 # Client service.
127125 " ${DOCKER} " build --force-rm -t " ${CLIENT_IMAGE} " " $( dirname " $0 " ) /client"
You can’t perform that action at this time.
0 commit comments