Skip to content

Commit 669b2e2

Browse files
committed
describe the different Dockerfile and deployment files provided for Open Liberty Operator and WebSphere Liberty Operator
Signed-off-by: Jianguo Ma <[email protected]>
1 parent 68ca1b3 commit 669b2e2

File tree

1 file changed

+6
-5
lines changed

1 file changed

+6
-5
lines changed

articles/aks/howto-deploy-java-liberty-app.md

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -125,6 +125,9 @@ java-app
125125
│ ├─ aks/
126126
│ │ ├─ db-secret.yaml
127127
│ │ ├─ openlibertyapplication-agic.yaml
128+
│ │ ├─ openlibertyapplication.yaml
129+
│ │ ├─ webspherelibertyapplication-agic.yaml
130+
│ │ ├─ webspherelibertyapplication.yaml
128131
│ ├─ docker/
129132
│ │ ├─ Dockerfile
130133
│ │ ├─ Dockerfile-wlp
@@ -138,7 +141,9 @@ java-app
138141

139142
The directories *java*, *resources*, and *webapp* contain the source code of the sample application. The code declares and uses a data source named `jdbc/JavaEECafeDB`.
140143

141-
In the *aks* directory, we placed three deployment files. *db-secret.xml* is used to create [Kubernetes Secrets](https://kubernetes.io/docs/concepts/configuration/secret/) with DB connection credentials. The file *openlibertyapplication-agic.yaml* is used to deploy the application image. In the *docker* directory, there are two files to create the application image with either Open Liberty or WebSphere Liberty.
144+
In the *aks* directory, there are five deployment files. *db-secret.xml* is used to create [Kubernetes Secrets](https://kubernetes.io/docs/concepts/configuration/secret/) with DB connection credentials. The file *openlibertyapplication-agic.yaml* is used in this quickstart to deploy the Open Liberty Application with AGIC. You can try to deploy the application without AGIC using the file *openlibertyapplication.yaml*. Besides, use the file *webspherelibertyapplication-agic.yaml* or *webspherelibertyapplication.yaml* to deploy the WebSphere Liberty Application with or without AGIC if you deployed WebSphere Liberty Operator in section [Create a Liberty on AKS deployment using the portal](#create-a-liberty-on-aks-deployment-using-the-portal).
145+
146+
In the *docker* directory, there are two files to create the application image with either Open Liberty (*Dockerfile*) or WebSphere Liberty (*Dockerfile-wlp*). You use the file *Dockerfile* to build the application image with Open Liberty in this quickstart. Similarily, use the file *Dockerfile-wlp* to build the application image with WebSphere Liberty if you deployed WebSphere Liberty Operator in section [Create a Liberty on AKS deployment using the portal](#create-a-liberty-on-aks-deployment-using-the-portal).
142147

143148
In directory *liberty/config*, the *server.xml* file is used to configure the DB connection for the Open Liberty and WebSphere Liberty cluster.
144149

@@ -185,11 +190,7 @@ You can now run the `docker build` command to build the image.
185190
```bash
186191
cd <path-to-your-repo>/java-app/target
187192

188-
# If you're running with Open Liberty
189193
docker build -t javaee-cafe:v1 --pull --file=Dockerfile .
190-
191-
# If you're running with WebSphere Liberty
192-
docker build -t javaee-cafe:v1 --pull --file=Dockerfile-wlp .
193194
```
194195

195196
### (Optional) Test the Docker image locally

0 commit comments

Comments
 (0)