Skip to content

Commit d558c88

Browse files
authored
[docs] Introduce $FLUSS_DOCKER_VERSION$ expression to reference docker image version (#1094)
1 parent 0cb955c commit d558c88

File tree

6 files changed

+30
-24
lines changed

6 files changed

+30
-24
lines changed

website/community/how-to-contribute/contribute-docs.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -116,6 +116,7 @@ git checkout release-0.5
116116
Fluss documentation uses placeholder variables that are automatically replaced during the build process. Note that these variables are only available for documentation under `website/docs/*`.
117117
- `$FLUSS_VERSION$`: Expands to the full version (e.g., "0.6.0")
118118
- `$FLUSS_VERSION_SHORT$`: Expands to the short version (e.g., "0.6")
119+
- `$FLUSS_DOCKER_VERSION$`: Expands to the docker version (e.g., "0.6.0-rc1"), it is suggested to use this variable when referring to the docker image version that we can link to a RC version during release testing.
119120

120121
For example, to link to a specific version of Fluss binary:
121122

website/docs/install-deploy/deploying-with-docker.md

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@ advertised.listeners: CLIENT://localhost:9123
8282
internal.listener.name: INTERNAL
8383
" \
8484
-p 9123:9123 \
85-
-d fluss/fluss:$FLUSS_VERSION$ coordinatorServer
85+
-d fluss/fluss:$FLUSS_DOCKER_VERSION$ coordinatorServer
8686
```
8787

8888
### Start Fluss TabletServer
@@ -108,7 +108,7 @@ data.dir: /tmp/fluss/data
108108
remote.data.dir: /tmp/fluss/remote-data" \
109109
-p 9124:9123 \
110110
--volume shared-tmpfs:/tmp/fluss \
111-
-d fluss/fluss:$FLUSS_VERSION$ tabletServer
111+
-d fluss/fluss:$FLUSS_DOCKER_VERSION$ tabletServer
112112
```
113113

114114
#### Start with Multiple TabletServer
@@ -131,7 +131,7 @@ data.dir: /tmp/fluss/data/tablet-server-0
131131
remote.data.dir: /tmp/fluss/remote-data" \
132132
-p 9124:9123 \
133133
--volume shared-tmpfs:/tmp/fluss \
134-
-d fluss/fluss:$FLUSS_VERSION$ tabletServer
134+
-d fluss/fluss:$FLUSS_DOCKER_VERSION$ tabletServer
135135
```
136136

137137
2. Start tablet-server-1
@@ -149,7 +149,7 @@ data.dir: /tmp/fluss/data/tablet-server-1
149149
remote.data.dir: /tmp/fluss/remote-data" \
150150
-p 9125:9123 \
151151
--volume shared-tmpfs:/tmp/fluss \
152-
-d fluss/fluss:$FLUSS_VERSION$ tabletServer
152+
-d fluss/fluss:$FLUSS_DOCKER_VERSION$ tabletServer
153153
```
154154

155155
3. Start tablet-server-2
@@ -167,7 +167,7 @@ data.dir: /tmp/fluss/data/tablet-server-2
167167
remote.data.dir: /tmp/fluss/remote-data" \
168168
-p 9126:9123 \
169169
--volume shared-tmpfs:/tmp/fluss \
170-
-d fluss/fluss:$FLUSS_VERSION$ tabletServer
170+
-d fluss/fluss:$FLUSS_DOCKER_VERSION$ tabletServer
171171
```
172172

173173
Now all the Fluss related components are running.
@@ -191,7 +191,7 @@ You can use the following `docker-compose.yml` file to start a Fluss cluster wit
191191
```yaml
192192
services:
193193
coordinator-server:
194-
image: fluss/fluss:$FLUSS_VERSION$
194+
image: fluss/fluss:$FLUSS_DOCKER_VERSION$
195195
command: coordinatorServer
196196
depends_on:
197197
- zookeeper
@@ -206,7 +206,7 @@ services:
206206
ports:
207207
- "9123:9123"
208208
tablet-server:
209-
image: fluss/fluss:$FLUSS_VERSION$
209+
image: fluss/fluss:$FLUSS_DOCKER_VERSION$
210210
command: tabletServer
211211
depends_on:
212212
- coordinator-server
@@ -244,7 +244,7 @@ You can use the following `docker-compose.yml` file to start a Fluss cluster wit
244244
```yaml
245245
services:
246246
coordinator-server:
247-
image: fluss/fluss:$FLUSS_VERSION$
247+
image: fluss/fluss:$FLUSS_DOCKER_VERSION$
248248
command: coordinatorServer
249249
depends_on:
250250
- zookeeper
@@ -259,7 +259,7 @@ services:
259259
ports:
260260
- "9123:9123"
261261
tablet-server-0:
262-
image: fluss/fluss:$FLUSS_VERSION$
262+
image: fluss/fluss:$FLUSS_DOCKER_VERSION$
263263
command: tabletServer
264264
depends_on:
265265
- coordinator-server
@@ -279,7 +279,7 @@ services:
279279
volumes:
280280
- shared-tmpfs:/tmp/fluss
281281
tablet-server-1:
282-
image: fluss/fluss:$FLUSS_VERSION$
282+
image: fluss/fluss:$FLUSS_DOCKER_VERSION$
283283
command: tabletServer
284284
depends_on:
285285
- coordinator-server
@@ -299,7 +299,7 @@ services:
299299
volumes:
300300
- shared-tmpfs:/tmp/fluss
301301
tablet-server-2:
302-
image: fluss/fluss:$FLUSS_VERSION$
302+
image: fluss/fluss:$FLUSS_DOCKER_VERSION$
303303
command: tabletServer
304304
depends_on:
305305
- coordinator-server

website/docs/maintenance/observability/quickstart.md

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ The container manifest below configures Fluss to use Logback and Loki4j. Save it
6464
```dockerfile
6565
ARG FLUSS_VERSION
6666

67-
FROM fluss/fluss:$FLUSS_VERSION$
67+
FROM fluss/fluss:$FLUSS_DOCKER_VERSION$
6868

6969
# remove default logging backend from classpath and add logback to classpath
7070
RUN rm -rf ${FLUSS_HOME}/lib/log4j-slf4j-impl-*.jar && \
@@ -96,7 +96,7 @@ To do this, you can simply copy the manifest below into your `docker-compose.yml
9696
services:
9797
#begin Fluss cluster
9898
coordinator-server:
99-
image: fluss-slf4j-logback:$FLUSS_VERSION$
99+
image: fluss-slf4j-logback:$FLUSS_DOCKER_VERSION$
100100
build:
101101
args:
102102
FLUSS_VERSION: $FLUSS_VERSION$
@@ -118,7 +118,7 @@ services:
118118
logback.configurationFile: logback-loki-console.xml
119119
- APP_NAME=coordinator-server
120120
tablet-server:
121-
image: fluss-slf4j-logback:$FLUSS_VERSION$
121+
image: fluss-slf4j-logback:$FLUSS_DOCKER_VERSION$
122122
build:
123123
args:
124124
FLUSS_VERSION: $FLUSS_VERSION$
@@ -147,7 +147,7 @@ services:
147147
#end
148148
#begin Flink cluster
149149
jobmanager:
150-
image: fluss/quickstart-flink:1.20-$FLUSS_VERSION_SHORT$
150+
image: fluss/quickstart-flink:1.20-$FLUSS_DOCKER_VERSION$
151151
ports:
152152
- "8083:8081"
153153
command: jobmanager
@@ -160,7 +160,7 @@ services:
160160
volumes:
161161
- shared-tmpfs:/tmp/paimon
162162
taskmanager:
163-
image: fluss/quickstart-flink:1.20-$FLUSS_VERSION_SHORT$
163+
image: fluss/quickstart-flink:1.20-$FLUSS_DOCKER_VERSION$
164164
depends_on:
165165
- jobmanager
166166
command: taskmanager

website/docs/quickstart/flink.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ cd fluss-quickstart-flink
5555
services:
5656
#begin Fluss cluster
5757
coordinator-server:
58-
image: fluss/fluss:$FLUSS_VERSION$
58+
image: fluss/fluss:$FLUSS_DOCKER_VERSION$
5959
command: coordinatorServer
6060
depends_on:
6161
- zookeeper
@@ -71,7 +71,7 @@ services:
7171
volumes:
7272
- shared-tmpfs:/tmp/paimon
7373
tablet-server:
74-
image: fluss/fluss:$FLUSS_VERSION$
74+
image: fluss/fluss:$FLUSS_DOCKER_VERSION$
7575
command: tabletServer
7676
depends_on:
7777
- coordinator-server
@@ -94,7 +94,7 @@ services:
9494
#end
9595
#begin Flink cluster
9696
jobmanager:
97-
image: fluss/quickstart-flink:1.20-$FLUSS_VERSION_SHORT$
97+
image: fluss/quickstart-flink:1.20-$FLUSS_DOCKER_VERSION$
9898
ports:
9999
- "8083:8081"
100100
command: jobmanager
@@ -105,7 +105,7 @@ services:
105105
volumes:
106106
- shared-tmpfs:/tmp/paimon
107107
taskmanager:
108-
image: fluss/quickstart-flink:1.20-$FLUSS_VERSION_SHORT$
108+
image: fluss/quickstart-flink:1.20-$FLUSS_DOCKER_VERSION$
109109
depends_on:
110110
- jobmanager
111111
command: taskmanager

website/fluss-versions.json

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,21 +2,25 @@
22
{
33
"versionName": "next",
44
"fullVersion": "0.8-SNAPSHOT",
5-
"shortVersion": "0.8-SNAPSHOT"
5+
"shortVersion": "0.8-SNAPSHOT",
6+
"dockerVersion": "0.8-SNAPSHOT"
67
},
78
{
89
"versionName": "version-0.7",
910
"fullVersion": "0.7.0",
10-
"shortVersion": "0.7"
11+
"shortVersion": "0.7",
12+
"dockerVersion": "v0.7.0-rc2"
1113
},
1214
{
1315
"versionName": "version-0.6",
1416
"fullVersion": "0.6.0",
15-
"shortVersion": "0.6"
17+
"shortVersion": "0.6",
18+
"dockerVersion": "0.6.0"
1619
},
1720
{
1821
"versionName": "version-0.5",
1922
"fullVersion": "0.5.0",
20-
"shortVersion": "0.5"
23+
"shortVersion": "0.5",
24+
"dockerVersion": "0.5.0"
2125
}
2226
]

website/src/plugins/remark-version-replace/index.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -52,6 +52,7 @@ const plugin = (options) => {
5252
const replacements = {
5353
"$FLUSS_VERSION$": version.fullVersion,
5454
"$FLUSS_VERSION_SHORT$": version.shortVersion,
55+
"$FLUSS_DOCKER_VERSION$": version.dockerVersion
5556
};
5657

5758
// RegExp to find any replacement keys.

0 commit comments

Comments
 (0)