You signed in with another tab or window. Reload to refresh your session.You signed out in another tab or window. Reload to refresh your session.You switched accounts on another tab or window. Reload to refresh your session.Dismiss alert
#### What type of PR is this?
Change from Docker Compose references to just Compose
<!--
Add one of the following kinds:
/kind bug
/kind cleanup
/kind documentation
/kind feature
-->
#### What this PR does / why we need it:
Compose is an open format and we should not say "Docker Compose".
#### Which issue(s) this PR fixes:
<!--
*Automatically closes linked issue when PR is merged.
Usage: `Fixes #<issue number>`, or `Fixes (paste link of issue)`.
-->
Fixes#1868
#### Special notes for your reviewer:
Signed-off-by: Charlie Drage <[email protected]>
Copy file name to clipboardExpand all lines: docs/conversion.md
+2-2
Original file line number
Diff line number
Diff line change
@@ -24,7 +24,7 @@ We're doing our best to keep it up to date as soon as possible in our releases t
24
24
**Glossary:**
25
25
26
26
-**✓:** Converts
27
-
-**-:** Not in this Docker Compose Version
27
+
-**-:** Not in this Compose Version
28
28
-**n:** Not yet implemented
29
29
-**x:** Not applicable / no 1-1 conversion
30
30
@@ -90,7 +90,7 @@ We're doing our best to keep it up to date as soon as possible in our releases t
90
90
| stop_signal | x | x | x || Not supported within Kubernetes. See issue https://github.com/kubernetes/kubernetes/issues/30051|
91
91
| sysctls | n | n | n |||
92
92
| ulimits | x | x | x || Not supported within Kubernetes. See issue https://github.com/kubernetes/kubernetes/issues/3595|
93
-
| userns_mode | x | x | x || Not supported within Kubernetes and ignored in Docker Compose Version 3 |
93
+
| userns_mode | x | x | x || Not supported within Kubernetes and ignored in Compose Version 3 |
94
94
| volumes | ✓ | ✓ | ✓ | PersistentVolumeClaim | Creates a PersistentVolumeClaim. Can only be created if there is already a PersistentVolume within the cluster |
95
95
| volumes: short-syntax | ✓ | ✓ | ✓ | PersistentVolumeClaim | Creates a PersistentVolumeClaim. Can only be created if there is already a PersistentVolume within the cluster |
96
96
| volumes: long-syntax | - | - | ✓ | PersistentVolumeClaim | Creates a PersistentVolumeClaim. Can only be created if there is already a PersistentVolume within the cluster |
@@ -48,7 +48,7 @@ There are some projects out there known to use Kompose integrated in some form o
48
48
49
49
**Description:** "Maven is one of the widely used build tools for Java applications. The Fabric8 Maven Plugin is a maven extension that simplifies the deployment of Java applications to Kubernetes or OpenShift clusters.
50
50
The main task of this plugin is to build Docker images, generate Kubernetes or OpenShift resource descriptors and run/deploy the application on Kubernetes or OpenShift cluster.
51
-
The plugin has a wide range of configuration options. Docker Compose is one of the options to bring up deployments on Kubernetes or OpenShift clusters.
51
+
The plugin has a wide range of configuration options. Compose is one of the options to bring up deployments on Kubernetes or OpenShift clusters.
52
52
Technically, Fabric8 Maven Plugin processes the external compose.yml file and generates Kubernetes or OpenShift resources via Kompose."
Copy file name to clipboardExpand all lines: docs/maven-example.md
+3-3
Original file line number
Diff line number
Diff line change
@@ -9,7 +9,7 @@ redirect_from:
9
9
10
10
# Fabric8 Maven Plugin + Kompose:
11
11
12
-
Let's deploy a Springboot Java application with Docker Compose file using Fabric8 Maven Plugin to Kubernetes or OpenShift.
12
+
Let's deploy a Springboot Java application with Compose file using Fabric8 Maven Plugin to Kubernetes or OpenShift.
13
13
14
14
##### Requirements
15
15
@@ -46,7 +46,7 @@ $ mvn fabric8:install
46
46
47
47
This command installs the `kompose` on the host.
48
48
49
-
**4. Configure Fabric8 Maven Plugin to use a Docker Compose file**
49
+
**4. Configure Fabric8 Maven Plugin to use a Compose file**
50
50
51
51
```bash
52
52
<plugin>
@@ -66,7 +66,7 @@ This command installs the `kompose` on the host.
66
66
</plugin>
67
67
```
68
68
69
-
Add the `<configuration>` and `<executions>` sections to `pom.xml` as shown in above `pom.xml` snippet. Update the `<composeFile>` to provide the relative path of Docker Compose file from `pom.xml`
69
+
Add the `<configuration>` and `<executions>` sections to `pom.xml` as shown in above `pom.xml` snippet. Update the `<composeFile>` to provide the relative path of Compose file from `pom.xml`
70
70
71
71
**5. Deploy application on Kubernetes or OpenShift**
Copy file name to clipboardExpand all lines: docs/user-guide.md
+4-4
Original file line number
Diff line number
Diff line change
@@ -17,7 +17,7 @@ You can choose a targeted provider using global option `--provider`. If no provi
17
17
18
18
## Kompose Convert
19
19
20
-
Kompose supports conversion of V1, V2, and V3 Docker Compose files into Kubernetes and OpenShift objects.
20
+
Kompose supports conversion of V1, V2, and V3 Compose files into Kubernetes and OpenShift objects.
21
21
22
22
### Kubernetes
23
23
@@ -609,9 +609,9 @@ services:
609
609
610
610
#### Warning about Deployment Config's
611
611
612
-
If the Docker Compose file has a volume specified for a service, the Deployment (Kubernetes) or DeploymentConfig (OpenShift) strategy is changed to "Recreate" instead of "RollingUpdate" (default). This is done to avoid multiple instances of a service from accessing a volume at the same time.
612
+
If the Compose file has a volume specified for a service, the Deployment (Kubernetes) or DeploymentConfig (OpenShift) strategy is changed to "Recreate" instead of "RollingUpdate" (default). This is done to avoid multiple instances of a service from accessing a volume at the same time.
613
613
614
-
If the Docker Compose file has service name with `_` or `.` in it (eg.`web_service` or `web.service`), then it will be replaced by `-` and the service name will be renamed accordingly (eg.`web-service`). Kompose does this because "Kubernetes" doesn't allow `_` in object name.
614
+
If the Compose file has service name with `_` or `.` in it (eg.`web_service` or `web.service`), then it will be replaced by `-` and the service name will be renamed accordingly (eg.`web-service`). Kompose does this because "Kubernetes" doesn't allow `_` in object name.
615
615
616
616
Please note that changing service name might break some `compose` files.
617
617
@@ -621,7 +621,7 @@ To generate network policies, all you need is to use the `--generate-network-pol
621
621
622
622
## Build and push image
623
623
624
-
If the Docker Compose file has `build` or `build:context, build:dockerfile` keys, build will run when `--build` specified.
624
+
If the Compose file has `build` or `build:context, build:dockerfile` keys, build will run when `--build` specified.
625
625
626
626
And Image will push to _docker.io_ (default) when `--push-image=true` specified.
0 commit comments