Skip to content

Commit d878b15

Browse files
DOC-3274: Fixed the docker guides for Hyperlinking, Image Proxy, and Spelling services for the TinyMCE 7 Docs.
1 parent ba2b471 commit d878b15

File tree

3 files changed

+68
-55
lines changed

3 files changed

+68
-55
lines changed

modules/ROOT/partials/docker/hyperlinking-service/hyperlinking-service-installation.adoc

Lines changed: 23 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ include::partial$misc/admon-docker-access.adoc[]
55

66
=== Retrieve Docker Image
77

8-
. Login into the {companyname} Cloud Docker Registry:
8+
. Login into the {companyname} Cloud Docker Registry:
99
+
1010
[source, sh, subs="attributes+"]
1111
----
@@ -23,9 +23,9 @@ Replace `<VERSION>` with `latest` or the specific version number.
2323

2424
include::partial$misc/admon-available-docker-images.adoc[]
2525

26-
=== Specify Configurations
26+
=== Specify Configurations
2727

28-
After completing the previous steps, run the Docker container from the pulled image:
28+
After completing the previous steps, run the Docker container from the pulled image:
2929

3030
[source, sh, subs="attributes+"]
3131
----
@@ -34,7 +34,7 @@ docker run -p 19100:19100 registry.containers.tiny.cloud/hyperlinking-tiny:<VERS
3434

3535
This triggers `-p 19100:19100`, exposing the service on `localhost:19100`. The service runs on port `19100` inside the Docker container, and this maps it to the same port on your localhost.
3636

37-
If set up correctly, the logs should display output similar to the following:
37+
If set up correctly, the logs should display output similar to the following:
3838

3939
[source, log]
4040
----
@@ -45,7 +45,7 @@ If set up correctly, the logs should display output similar to the following:
4545
2025-01-02 11:06:46 [io-compute-blocker-8] WARN c.e.d.config.AllowedOriginsConfig$ - No allowed-origins specified in config!
4646
2025-01-02 11:06:46 [io-compute-blocker-8] INFO navi - navi config loaded successfully: NaviConfig(LinkCheckerConfig(true,ReturnUnknown),true,CacheConfig(10000,86400 seconds,3600 seconds),SdkServiceWithClientConfig(HttpConfig(100,10,10,3,HttpConfigTimeouts(10,10,10),JvmTrustModel()),None,OriginWhitelist(List(),OriginPrecision(true))),SelfHostedMediaSourcesConfig(CustomEmbedPlugins(UrlTrie(Branch(None,TreeMap()),Branch(None,TreeMap()))),None),OriginWhitelist(List(),OriginPrecision(true)),Logger[navi])
4747
2025-01-02 11:06:46 [io-compute-9] INFO o.h.b.c.nio1.NIO1SocketServerGroup - Service bound to address /0:0:0:0:0:0:0:0:19100
48-
2025-01-02 11:06:46 [io-compute-9] INFO o.h.blaze.server.BlazeServerBuilder -
48+
2025-01-02 11:06:46 [io-compute-9] INFO o.h.blaze.server.BlazeServerBuilder -
4949
_ _ _ _ _
5050
| |_| |_| |_ _ __| | | ___
5151
| ' \\ _| _| '_ \\_ _(_-<
@@ -56,7 +56,7 @@ If set up correctly, the logs should display output similar to the following:
5656

5757
Running this command will generate a log warning about `allowed-origins` not being configured. This is expected, as it will be set up in the next step.
5858

59-
The {productname} server-side components require a configuration file to function correctly. By convention, this file is named `application.conf`. For more information, refer to link:https://www.tiny.cloud/docs/tinymce/latest/configure-required-services/[Required configuration for the server-side components^].
59+
The {productname} server-side components require a configuration file to function correctly. By convention, this file is named `application.conf`. For more information, refer to link:https://www.tiny.cloud/docs/tinymce/latest/configure-required-services/[Required configuration for the server-side components^].
6060

6161
This configuration file requires at least the following information:
6262

@@ -96,7 +96,7 @@ The Docker container can also be run with `docker compose`. In this example, the
9696
----
9797
hyperlinking-service/
9898
├── application.conf
99-
└── docker-compose.yaml
99+
└── docker-compose.yaml
100100
----
101101

102102
Here is an example of the application.conf file with the basic configurations:
@@ -133,11 +133,17 @@ services:
133133
init: true
134134
volumes:
135135
- type: bind
136-
source: ./application.conf #change this to the path on your local machine
137-
target: /ephox-hyperlinking/ephox-hyperlinking-docker-env.conf
136+
source: ./application.conf #change this to the path on your local machine
137+
# Use the below target path if using any version below 2.109.6.
138+
# target: /ephox-hyperlinking/ephox-hyperlinking-docker-env.conf
139+
target: /app/application.conf
138140
read_only: true
139141
----
140142

143+
+
144+
[NOTE]
145+
From version 2.109.6 onwards, the `target` path in the volums option must point to `/app/application.conf` .
146+
141147
. Run the service (within the same directory where `docker-compose.yaml` was placed):
142148
+
143149

@@ -151,7 +157,7 @@ If the setup is correct, the initiation logs should appear as follows:
151157
+
152158
[source, log]
153159
----
154-
✔ Container hyperlinking-tiny-hyperlinking-tiny-1 Recreated 0.1s
160+
✔ Container hyperlinking-tiny-hyperlinking-tiny-1 Recreated 0.1s
155161
Attaching to hyperlinking-tiny-1
156162
hyperlinking-tiny-1 | 2025-01-02 16:17:28 [io-compute-1] INFO navi - navi
157163
@@ -177,7 +183,7 @@ hyperlinking-tiny-1 | - localhost:8000
177183
hyperlinking-tiny-1 | - ephox.com
178184
hyperlinking-tiny-1 | 2025-01-02 16:17:28 [io-compute-blocker-1] INFO navi - navi config loaded successfully: NaviConfig(LinkCheckerConfig(true,ReturnUnknown),true,CacheConfig(10000,86400 seconds,3600 seconds),SdkServiceWithClientConfig(HttpConfig(100,10,10,3,HttpConfigTimeouts(15,15,15),JvmTrustModel()),None,OriginWhitelist(List(localhost, localhost:8000, ephox.com),OriginPrecision(true))),SelfHostedMediaSourcesConfig(CustomEmbedPlugins(UrlTrie(Branch(None,TreeMap()),Branch(None,TreeMap(org -> Branch(None,TreeMap(wikipedia -> Branch(None,TreeMap(en -> Branch(Some(PathMatcher(List((wiki/.*,WikipediaEmbedPlugin(https://en.wikipedia.org/w/api.php,10))))),TreeMap()))))))))),None),OriginWhitelist(List(localhost, localhost:8000, ephox.com),OriginPrecision(true)),Logger[navi])
179185
hyperlinking-tiny-1 | 2025-01-02 16:17:29 [io-compute-6] INFO o.h.b.c.nio1.NIO1SocketServerGroup - Service bound to address /0:0:0:0:0:0:0:0:19100
180-
hyperlinking-tiny-1 | 2025-01-02 16:17:29 [io-compute-6] INFO o.h.blaze.server.BlazeServerBuilder -
186+
hyperlinking-tiny-1 | 2025-01-02 16:17:29 [io-compute-6] INFO o.h.blaze.server.BlazeServerBuilder -
181187
hyperlinking-tiny-1 | _ _ _ _ _
182188
hyperlinking-tiny-1 | | |_| |_| |_ _ __| | | ___
183189
hyperlinking-tiny-1 | | ' \\ _| _| '_ \\_ _(_-<
@@ -211,9 +217,9 @@ To confirm that a request is being sent to the {linkcheckerplugin} service, use:
211217
+
212218
[source, sh]
213219
----
214-
curl --location 'http://localhost:19100/1/check' \\
215-
--header 'Origin: http://good.com' \\
216-
--header 'Content-Type: application/json' \\
220+
curl --location 'http://localhost:19100/1/check' \
221+
--header 'Origin: http://good.com' \
222+
--header 'Content-Type: application/json' \
217223
--data '{ "urls": [{"url":"http://google.com"}, {"url": "http://youtube.com"}, {"url":"http://google.com/404"}, {"url":"https://ephox.."}]}'
218224
----
219225

@@ -223,9 +229,9 @@ Finally, to verify if a request is unauthorized and originates from an incorrect
223229
+
224230
[source, sh]
225231
----
226-
curl --location 'http://localhost:19100/1/check' \\
227-
--header 'Origin: http://bad.com' \\
228-
--header 'Content-Type: application/json' \\
232+
curl --location 'http://localhost:19100/1/check' \
233+
--header 'Origin: http://bad.com' \
234+
--header 'Content-Type: application/json' \
229235
--data '{ "urls": [{"url":"http://google.com"}, {"url": "http://youtube.com"}, {"url":"http://google.com/404"}, {"url":"https://ephox.."}]}'
230236
----
231237

modules/ROOT/partials/docker/image-proxy-service/image-proxy-service-installation.adoc

Lines changed: 21 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ link:https://www.tiny.cloud/contact/[Contact {companyname} Support^] to request
77

88
=== Retrieve Docker Image
99

10-
. Login into the {companyname} Cloud Docker Registry:
10+
. Login into the {companyname} Cloud Docker Registry:
1111
+
1212
[source, sh, subs="attributes+"]
1313
----
@@ -25,9 +25,9 @@ Replace `<VERSION>` with `latest` or the specific version number.
2525

2626
[NOTE]
2727
Currently, the Docker images are only supported on x86-64 (also known as AMD64) architecture processors.
28-
=== Specify Configurations
28+
=== Specify Configurations
2929

30-
After completing the previous steps, run the Docker container from the pulled image:
30+
After completing the previous steps, run the Docker container from the pulled image:
3131

3232
[source, sh, subs="attributes+"]
3333
----
@@ -36,7 +36,7 @@ docker run -p 19040:19040 registry.containers.tiny.cloud/image-proxy-tiny:<VERSI
3636

3737
This triggers `-p 19040:19040`, exposing the service on `localhost:19040`. The service runs on port `19040` inside the Docker container, and this maps it to the same port on your localhost.
3838

39-
If set up correctly, the logs should display output similar to the following:
39+
If set up correctly, the logs should display output similar to the following:
4040

4141
[source, log]
4242
----
@@ -46,7 +46,7 @@ If set up correctly, the logs should display output similar to the following:
4646
2025-01-08 12:03:16 [io-compute-blocker-3] WARN c.e.d.config.AllowedOriginsConfig$ - No allowed-origins specified in config!
4747
2025-01-08 12:03:16 [io-compute-blocker-3] INFO emissary - emissary config loaded successfully: EmissaryConfig(SdkHttpConfig(HttpConfig(100,10,10,3,HttpConfigTimeouts(10,10,10),JvmTrustModel()),None),OriginWhitelist(List(),OriginPrecision(true)),Some(10000000))
4848
2025-01-08 12:03:17 [io-compute-1] INFO o.h.b.c.nio1.NIO1SocketServerGroup - Service bound to address /0:0:0:0:0:0:0:0:19040
49-
2025-01-08 12:03:17 [io-compute-1] INFO o.h.blaze.server.BlazeServerBuilder -
49+
2025-01-08 12:03:17 [io-compute-1] INFO o.h.blaze.server.BlazeServerBuilder -
5050
_ _ _ _ _
5151
| |_| |_| |_ _ __| | | ___
5252
| ' \\ _| _| '_ \\_ _(_-<
@@ -57,7 +57,7 @@ If set up correctly, the logs should display output similar to the following:
5757

5858
Running this command will generate a log warning about `allowed-origins` not being configured. This is expected, as it will be set up in the next step.
5959

60-
The {productname} server-side components require a configuration file to function correctly. By convention, this file is named `application.conf`. For more information, refer to link:https://www.tiny.cloud/docs/tinymce/latest/configure-required-services/[Required configuration for the server-side components].
60+
The {productname} server-side components require a configuration file to function correctly. By convention, this file is named `application.conf`. For more information, refer to link:https://www.tiny.cloud/docs/tinymce/latest/configure-required-services/[Required configuration for the server-side components].
6161

6262
This configuration file requires at least the following information:
6363

@@ -72,9 +72,9 @@ The following settings for the Image Proxy service premium server-side component
7272

7373
* link:https://www.tiny.cloud/docs/tinymce/latest/configure-imageproxy-service/#image-proxy[image-proxy configuration]
7474

75-
=== Run the Docker Container
75+
=== Run the Docker Container
7676

77-
The Docker container can also be run with `docker compose`. In this example, the following directory structure is assumed:
77+
The Docker container can also be run with `docker compose`. In this example, the following directory structure is assumed:
7878

7979
[source,sh]
8080
----
@@ -83,7 +83,7 @@ tiny-image-proxy/
8383
└── application.conf # Configuration file for allowed origins and other settings
8484
----
8585

86-
Here is an example of the `application.conf` file with the basic configurations:
86+
Here is an example of the `application.conf` file with the basic configurations:
8787

8888
[source, conf]
8989
----
@@ -115,10 +115,16 @@ services:
115115
volumes:
116116
- type: bind
117117
source: ./application.conf #change this to the path on your local machine
118-
target: /ephox-image-proxy/ephox-image-proxy-docker-env.conf
118+
# Use the below target path if using any version below 2.111.7.
119+
# target: /ephox-image-proxy/ephox-image-proxy-docker-env.conf
120+
target: /app/application.conf
119121
read_only: true
120122
----
121123

124+
+
125+
[NOTE]
126+
From version 2.111.7 onwards, the `target` path in the volumes option must point to `/app/application.conf` .
127+
122128
. Run the service (within the same directory where `docker-compose.yaml` was placed):
123129

124130
+
@@ -133,7 +139,7 @@ If the setup is correct, the initiation logs should appear as follows:
133139
+
134140
[source, log]
135141
----
136-
✔ Container image-proxy-tiny-image-proxy-tiny-1 Created 0.0s
142+
✔ Container image-proxy-tiny-image-proxy-tiny-1 Created 0.0s
137143
Attaching to image-proxy-tiny-1
138144
image-proxy-tiny-1 | 2025-01-08 15:02:36 [io-compute-8] INFO emissary - emissary
139145
image-proxy-tiny-1 | 2025-01-08 15:02:36 [io-compute-8] INFO emissary - * External Configuration
@@ -160,7 +166,7 @@ image-proxy-tiny-1 | - good.com
160166
image-proxy-tiny-1 | - example.com
161167
image-proxy-tiny-1 | 2025-01-08 15:02:36 [io-compute-blocker-8] INFO emissary - emissary config loaded successfully: EmissaryConfig(SdkHttpConfig(HttpConfig(100,10,10,3,HttpConfigTimeouts(10,10,10),JvmTrustModel()),None),OriginWhitelist(List(good.com, example.com),OriginPrecision(true)),Some(10000000))
162168
image-proxy-tiny-1 | 2025-01-08 15:02:37 [io-compute-1] INFO o.h.b.c.nio1.NIO1SocketServerGroup - Service bound to address /0:0:0:0:0:0:0:0:19040
163-
image-proxy-tiny-1 | 2025-01-08 15:02:37 [io-compute-1] INFO o.h.blaze.server.BlazeServerBuilder -
169+
image-proxy-tiny-1 | 2025-01-08 15:02:37 [io-compute-1] INFO o.h.blaze.server.BlazeServerBuilder -
164170
image-proxy-tiny-1 | _ _ _ _ _
165171
image-proxy-tiny-1 | | |_| |_| |_ _ __| | | ___
166172
image-proxy-tiny-1 | | ' \\ _| _| '_ \\_ _(_-<
@@ -169,7 +175,7 @@ image-proxy-tiny-1 | |_|
169175
image-proxy-tiny-1 | 2025-01-08 15:02:37 [io-compute-1] INFO o.h.blaze.server.BlazeServerBuilder - http4s v0.23.27 on blaze v0.23.16 started at http://[::]:19040/
170176
----
171177

172-
=== Next Steps
178+
=== Next Steps
173179

174180
. Test the service via cURL command
175181

@@ -194,7 +200,7 @@ To confirm that a request is being sent to the Image Proxy service, use:
194200
+
195201
[source, sh]
196202
----
197-
curl --location 'http://localhost:19040/2/image?url=https%3A%2F%2Fraw.githubusercontent.com%2Fsrikomm%2FBMP-EDITING%2Frefs%2Fheads%2Fmaster%2Fsrc%2FInputs%2Ffish.bmp' \\
203+
curl --location 'http://localhost:19040/2/image?url=https%3A%2F%2Fraw.githubusercontent.com%2Fsrikomm%2FBMP-EDITING%2Frefs%2Fheads%2Fmaster%2Fsrc%2FInputs%2Ffish.bmp' \
198204
--header 'Origin: http://good.com'
199205
----
200206

@@ -204,7 +210,7 @@ Finally, to verify if a request is unauthorized and originates from an incorrect
204210
+
205211
[source, sh]
206212
----
207-
curl --location 'http://localhost:19040/2/image?url=https%3A%2F%2Fraw.githubusercontent.com%2Fsrikomm%2FBMP-EDITING%2Frefs%2Fheads%2Fmaster%2Fsrc%2FInputs%2Ffish.bmp' \\
213+
curl --location 'http://localhost:19040/2/image?url=https%3A%2F%2Fraw.githubusercontent.com%2Fsrikomm%2FBMP-EDITING%2Frefs%2Fheads%2Fmaster%2Fsrc%2FInputs%2Ffish.bmp' \
208214
--header 'Origin: http://bad.com'
209215
----
210216

0 commit comments

Comments
 (0)