SpringCloud/spring-cloud-dataflow-samples
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Updated versions and replaced mysql docs with mariadb

Browse Source 
Updated Readme to replace the use of mysql with mariadb.
Updated instructions to use boot image builder instead of Jib.
Updated vesions
This commit is contained in:
Glenn Renfro
2022-01-06 13:40:20 -05:00
parent 192566ed04
commit 7c11592f74
2 changed files with 7 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
dataflow-website/batch-developer-guides/batch/batchsamples/README.adoc
View File

@@ -21,7 +21,7 @@ $./mvnw clean package -Pdist
== Build the Docker Images for the project
```
$ ./mvnw clean package jib:dockerBuild
$ ./mvnw spring-boot:build-image
```
NOTE: You can modify the docker org and version by applying the following: `-Ddocker.org=<your org> -Ddocker.version=<your version>`
@@ -30,16 +30,16 @@ NOTE: You can modify the docker org and version by applying the following: `-Ddo
=== To execute billsetuptask locally
Assuming you are using MySql
Assuming you are using Mariadb
```
$ java -jar target/billsetuptask-1.0.0.BUILD-SNAPSHOT.jar --spring.datasource.url=jdbc:mysql://localhost:3306/<your database>?useSSL=false --spring.datasource.username=<user> --spring.datasource.password=<password> --spring.datasource.driverClassName=com.mysql.jdbc.Driver
$ java -jar target/billsetuptask-0.0.1-SNAPSHOT.jar --spring.datasource.url=jdbc:mariadb://localhost:3306/<your database>?useSSL=false --spring.datasource.username=<user> --spring.datasource.password=<password> --spring.datasource.driverClassName=org.mariadb.jdbc.Driver
```
=== To execute billrun locally
Assuming you are using MySql, this app will load data from the usageinfo.txt file found in the classpath (included in the jar).
Assuming you are using Mariadb, this app will load data from the usageinfo.txt file found in the classpath (included in the jar).
```
$ java -jar target/billrun-1.0.0.BUILD-SNAPSHOT.jar --spring.datasource.url=jdbc:mysql://localhost:3306/<yourdatabase>?useSSL=false --spring.datasource.username=<your user> --spring.datasource.password=<your password> --spring.datasource.driverClassName=com.mysql.jdbc.Driver
$ java -jar target/billrun-0.0.1-SNAPSHOT.jar --spring.datasource.url=--spring.datasource.url=jdbc:mariadb://localhost:3306/<your database>?useSSL=false --spring.datasource.username=<user> --spring.datasource.password=<password> --spring.datasource.driverClassName=org.mariadb.jdbc.Driver
```
If you wish to read a directory containing the data you can use the following command line argument:
`--usage.file.name=file://<location of json file to upload>`

20
dataflow-website/batch-developer-guides/batch/batchsamples/pom.xml
View File

@@ -14,7 +14,7 @@
<parent>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-parent</artifactId>
<version>2.2.2.RELEASE</version>
<version>2.6.2</version>
<relativePath/> <!-- lookup parent from repository -->
</parent>
@@ -22,7 +22,7 @@
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<java.version>1.8</java.version>
<spring-cloud.version>Greenwich.SR1</spring-cloud.version>
<spring-cloud.version>2021.0.0</spring-cloud.version>
<docker.org>springcloudtask</docker.org>
<docker.version>${project.version}</docker.version>
</properties>
@@ -85,22 +85,6 @@
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-maven-plugin</artifactId>
</plugin>
<plugin>
<groupId>com.google.cloud.tools</groupId>
<artifactId>jib-maven-plugin</artifactId>
<version>0.10.1</version>
<configuration>
<from>
<image>springcloud/openjdk</image>
</from>
<to>
<image>${docker.org}/${project.artifactId}:${docker.version}</image>
</to>
<container>
<useCurrentTimestamp>true</useCurrentTimestamp>
</container>
</configuration>
</plugin>
</plugins>
</build>