Skip to content

Commit 9d80f33

Browse files
ElisDNElisDN
committed
Change non-root ports
1 parent 44053b8 commit 9d80f33

3 files changed

Lines changed: 23 additions & 29 deletions

File tree

‎api/tests/Functional/WiremockClient.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
public function __construct()
1414
{
1515
$this->client = new Client([
16-
'base_uri' => 'http://wiremock',
16+
'base_uri' => 'http://wiremock:8080',
1717
]);
1818
}
1919

‎compose-testing.yml‎

Lines changed: 13 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -64,13 +64,13 @@ services:
6464
JWT_PRIVATE_KEY_PATH: /run/secrets/jwt_private_key
6565
OAUTH_CALLBACK_URL: http://api.localhost
6666
OAUTH_YANDEX_AUTH_URL: http://wiremock.localhost/oauth.yandex.ru
67-
OAUTH_YANDEX_TOKEN_URL: http://wiremock/oauth.yandex.ru
68-
OAUTH_YANDEX_API_URL: http://wiremock/login.yandex.ru
67+
OAUTH_YANDEX_TOKEN_URL: http://wiremock:8080/oauth.yandex.ru
68+
OAUTH_YANDEX_API_URL: http://wiremock:8080/login.yandex.ru
6969
OAUTH_YANDEX_CLIENT_ID: app
7070
OAUTH_YANDEX_CLIENT_SECRET_FILE: /run/secrets/oauth_yandex_client_secret
7171
OAUTH_MAILRU_AUTH_URL: http://wiremock.localhost/oauth.mail.ru
72-
OAUTH_MAILRU_TOKEN_URL: http://wiremock/oauth.mail.ru
73-
OAUTH_MAILRU_API_URL: http://wiremock/oauth.mail.ru
72+
OAUTH_MAILRU_TOKEN_URL: http://wiremock:8080/oauth.mail.ru
73+
OAUTH_MAILRU_API_URL: http://wiremock:8080/oauth.mail.ru
7474
OAUTH_MAILRU_CLIENT_ID: app
7575
OAUTH_MAILRU_CLIENT_SECRET_FILE: /run/secrets/oauth_mailru_client_secret
7676
secrets:
@@ -104,13 +104,13 @@ services:
104104
JWT_PRIVATE_KEY_PATH: /run/secrets/jwt_private_key
105105
OAUTH_CALLBACK_URL: http://api.localhost
106106
OAUTH_YANDEX_AUTH_URL: http://wiremock.localhost/oauth.yandex.ru
107-
OAUTH_YANDEX_TOKEN_URL: http://wiremock/oauth.yandex.ru
108-
OAUTH_YANDEX_API_URL: http://wiremock/login.yandex.ru
107+
OAUTH_YANDEX_TOKEN_URL: http://wiremock:8080/oauth.yandex.ru
108+
OAUTH_YANDEX_API_URL: http://wiremock:8080/login.yandex.ru
109109
OAUTH_YANDEX_CLIENT_ID: app
110110
OAUTH_YANDEX_CLIENT_SECRET_FILE: /run/secrets/oauth_yandex_client_secret
111111
OAUTH_MAILRU_AUTH_URL: http://wiremock.localhost/oauth.mail.ru
112-
OAUTH_MAILRU_TOKEN_URL: http://wiremock/oauth.mail.ru
113-
OAUTH_MAILRU_API_URL: http://wiremock/oauth.mail.ru
112+
OAUTH_MAILRU_TOKEN_URL: http://wiremock:8080/oauth.mail.ru
113+
OAUTH_MAILRU_API_URL: http://wiremock:8080/oauth.mail.ru
114114
OAUTH_MAILRU_CLIENT_ID: app
115115
OAUTH_MAILRU_CLIENT_SECRET_FILE: /run/secrets/oauth_mailru_client_secret
116116
secrets:
@@ -144,13 +144,13 @@ services:
144144
JWT_PRIVATE_KEY_PATH: /run/secrets/jwt_private_key
145145
OAUTH_CALLBACK_URL: http://api.localhost
146146
OAUTH_YANDEX_AUTH_URL: http://wiremock.localhost/oauth.yandex.ru
147-
OAUTH_YANDEX_TOKEN_URL: http://wiremock/oauth.yandex.ru
148-
OAUTH_YANDEX_API_URL: http://wiremock/login.yandex.ru
147+
OAUTH_YANDEX_TOKEN_URL: http://wiremock:8080/oauth.yandex.ru
148+
OAUTH_YANDEX_API_URL: http://wiremock:8080/login.yandex.ru
149149
OAUTH_YANDEX_CLIENT_ID: app
150150
OAUTH_YANDEX_CLIENT_SECRET_FILE: /run/secrets/oauth_yandex_client_secret
151151
OAUTH_MAILRU_AUTH_URL: http://wiremock.localhost/oauth.mail.ru
152-
OAUTH_MAILRU_TOKEN_URL: http://wiremock/oauth.mail.ru
153-
OAUTH_MAILRU_API_URL: http://wiremock/oauth.mail.ru
152+
OAUTH_MAILRU_TOKEN_URL: http://wiremock:8080/oauth.mail.ru
153+
OAUTH_MAILRU_API_URL: http://wiremock:8080/oauth.mail.ru
154154
OAUTH_MAILRU_CLIENT_ID: app
155155
OAUTH_MAILRU_CLIENT_SECRET_FILE: /run/secrets/oauth_mailru_client_secret
156156
secrets:
@@ -185,17 +185,14 @@ services:
185185
- default
186186
volumes:
187187
- ./wiremock:/home/wiremock
188-
healthcheck:
189-
test: wget --no-verbose --tries=1 --spider http://localhost/__admin/health || exit 1
190188
command:
191-
- '--port=80'
192189
- '--global-response-templating'
193190
- '--verbose'
194191
labels:
195192
- traefik.enable=true
196193
- traefik.docker.network=traefik-public
197194
- traefik.http.routers.wiremock.rule=Host(`wiremock.localhost`)
198-
- traefik.http.services.wiremock.loadBalancer.server.port=80
195+
- traefik.http.services.wiremock.loadBalancer.server.port=8080
199196
- traefik.http.routers.wiremock.entryPoints=http
200197

201198
cucumber-node-cli:

‎compose.yml‎

Lines changed: 9 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -97,13 +97,13 @@ services:
9797
JWT_PRIVATE_KEY_PATH: /run/secrets/jwt_private_key
9898
OAUTH_CALLBACK_URL: http://api.localhost
9999
OAUTH_YANDEX_AUTH_URL: http://wiremock.localhost/oauth.yandex.ru
100-
OAUTH_YANDEX_TOKEN_URL: http://wiremock/oauth.yandex.ru
101-
OAUTH_YANDEX_API_URL: http://wiremock/login.yandex.ru
100+
OAUTH_YANDEX_TOKEN_URL: http://wiremock:8080/oauth.yandex.ru
101+
OAUTH_YANDEX_API_URL: http://wiremock:8080/login.yandex.ru
102102
OAUTH_YANDEX_CLIENT_ID: app
103103
OAUTH_YANDEX_CLIENT_SECRET_FILE: /run/secrets/oauth_yandex_client_secret
104104
OAUTH_MAILRU_AUTH_URL: http://wiremock.localhost/oauth.mail.ru
105-
OAUTH_MAILRU_TOKEN_URL: http://wiremock/oauth.mail.ru
106-
OAUTH_MAILRU_API_URL: http://wiremock/oauth.mail.ru
105+
OAUTH_MAILRU_TOKEN_URL: http://wiremock:8080/oauth.mail.ru
106+
OAUTH_MAILRU_API_URL: http://wiremock:8080/oauth.mail.ru
107107
OAUTH_MAILRU_CLIENT_ID: app
108108
OAUTH_MAILRU_CLIENT_SECRET_FILE: /run/secrets/oauth_mailru_client_secret
109109
volumes:
@@ -144,13 +144,13 @@ services:
144144
JWT_PRIVATE_KEY_PATH: /run/secrets/jwt_private_key
145145
OAUTH_CALLBACK_URL: http://api.localhost
146146
OAUTH_YANDEX_AUTH_URL: http://wiremock.localhost/oauth.yandex.ru
147-
OAUTH_YANDEX_TOKEN_URL: http://wiremock/oauth.yandex.ru
148-
OAUTH_YANDEX_API_URL: http://wiremock/login.yandex.ru
147+
OAUTH_YANDEX_TOKEN_URL: http://wiremock:8080/oauth.yandex.ru
148+
OAUTH_YANDEX_API_URL: http://wiremock:8080/login.yandex.ru
149149
OAUTH_YANDEX_CLIENT_ID: app
150150
OAUTH_YANDEX_CLIENT_SECRET_FILE: /run/secrets/oauth_yandex_client_secret
151151
OAUTH_MAILRU_AUTH_URL: http://wiremock.localhost/oauth.mail.ru
152-
OAUTH_MAILRU_TOKEN_URL: http://wiremock/oauth.mail.ru
153-
OAUTH_MAILRU_API_URL: http://wiremock/oauth.mail.ru
152+
OAUTH_MAILRU_TOKEN_URL: http://wiremock:8080/oauth.mail.ru
153+
OAUTH_MAILRU_API_URL: http://wiremock:8080/oauth.mail.ru
154154
OAUTH_MAILRU_CLIENT_ID: app
155155
OAUTH_MAILRU_CLIENT_SECRET_FILE: /run/secrets/oauth_mailru_client_secret
156156
volumes:
@@ -222,17 +222,14 @@ services:
222222
- default
223223
volumes:
224224
- ./wiremock:/home/wiremock
225-
healthcheck:
226-
test: wget --no-verbose --tries=1 --spider http://localhost/__admin/health || exit 1
227225
command:
228-
- '--port=80'
229226
- '--global-response-templating'
230227
- '--verbose'
231228
labels:
232229
- traefik.enable=true
233230
- traefik.docker.network=traefik-public
234231
- traefik.http.routers.wiremock.rule=Host(`wiremock.localhost`)
235-
- traefik.http.services.wiremock.loadBalancer.server.port=80
232+
- traefik.http.services.wiremock.loadBalancer.server.port=8080
236233
- traefik.http.routers.wiremock.entryPoints=http
237234

238235
backup-storage:

0 commit comments

Comments
 (0)