From 6d9391e777b688177f56124a8215e4028108fcad Mon Sep 17 00:00:00 2001 From: kalencaya <1942460489@qq.com> Date: Wed, 6 Dec 2023 22:25:47 +0800 Subject: [PATCH] [Bug][docker] fix workflows and scaleph-api dockerfile error (#657) * feature: image tag * feature: image tag * feature: image tag * feature: rename workflow files * feature: optimize flink kubernetes template * feature: optimize flink kubernetes template --- .../{docker-build.yml => ci-docker-build.yml} | 23 +++++++++- .github/workflows/{ci.yml => ci-maven.yml} | 24 +++++++++- .github/workflows/ci-npm.yml | 44 +++++++++++++++++++ .github/workflows/release-dist-bin.yml | 16 +++++++ ...nk.yml => release-manual-docker-flink.yml} | 2 +- ...ml => release-manual-docker-seatunnel.yml} | 2 +- ...=> release-manual-docker-sql-template.yml} | 2 +- ....yml => release-master-docker-scaleph.yml} | 23 +++++++++- ...ase.yml => release-tag-docker-scaleph.yml} | 22 ++++++++-- .github/workflows/sonarcloud.yml | 16 +++++++ .github/workflows/test.yml | 28 ------------ .github/workflows/web-ide.yml | 16 +++++++ README.md | 2 +- .../src/main/resources/application-dev.yml | 34 +++++++------- tools/docker/build/scaleph-api/Dockerfile | 23 +--------- .../docker/mysql/init.d/scaleph-ws-mysql.sql | 2 +- 16 files changed, 199 insertions(+), 80 deletions(-) rename .github/workflows/{docker-build.yml => ci-docker-build.yml} (65%) rename .github/workflows/{ci.yml => ci-maven.yml} (51%) create mode 100644 .github/workflows/ci-npm.yml rename .github/workflows/{docker-flink.yml => release-manual-docker-flink.yml} (98%) rename .github/workflows/{docker-seatunnel.yml => release-manual-docker-seatunnel.yml} (98%) rename .github/workflows/{docker-sql-template.yml => release-manual-docker-sql-template.yml} (98%) rename .github/workflows/{docker-release.yml => release-master-docker-scaleph.yml} (63%) rename .github/workflows/{release.yml => release-tag-docker-scaleph.yml} (65%) delete mode 100644 .github/workflows/test.yml diff --git a/.github/workflows/docker-build.yml b/.github/workflows/ci-docker-build.yml similarity index 65% rename from .github/workflows/docker-build.yml rename to .github/workflows/ci-docker-build.yml index 9a96cbedc..0a9661d07 100644 --- a/.github/workflows/docker-build.yml +++ b/.github/workflows/ci-docker-build.yml @@ -1,4 +1,20 @@ -name: Docker-Build +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +name: CI-Docker-Build on: push: @@ -46,6 +62,9 @@ jobs: platforms: amd64,arm64 - name: Set up Docker Buildx uses: docker/setup-buildx-action@v2 + - name: Fetch Project Version + run: | + echo "PROJECT_VERSION=$(mvn help:evaluate -Dexpression=project.version -q -DforceStdout)" >>$GITHUB_ENV - name: Build scaleph-dist run: mvn -B -U -T 4C clean package -Pdist -DskipTests -Dfast - name: Build scaleph-ui-react-dist @@ -63,5 +82,5 @@ jobs: platforms: linux/amd64,linux/arm64 file: tools/docker/build/${{ matrix.image }}/Dockerfile tags: | - ${{ env.HUB }}/${{ matrix.image }}:${{ github.sha }}, + ${{ env.HUB }}/${{ matrix.image }}:${{ env.PROJECT_VERSION }}, ${{ env.HUB }}/${{ matrix.image }}:latest \ No newline at end of file diff --git a/.github/workflows/ci.yml b/.github/workflows/ci-maven.yml similarity index 51% rename from .github/workflows/ci.yml rename to .github/workflows/ci-maven.yml index daca2dc17..e9de9ceed 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci-maven.yml @@ -1,4 +1,20 @@ -name: CI +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +name: CI-Maven on: pull_request: @@ -28,9 +44,13 @@ jobs: java-version: ${{ matrix.jdk }} distribution: temurin cache: maven + - name: Build scaleph-dist + timeout-minutes: 360 + run: mvn -B -U -T 4C clean package -Pdist -DskipTests -Dfast - name: Build with Maven timeout-minutes: 360 - run: mvn -B -U -T 4C clean package --file pom.xml + run: mvn -B -U -T 4C clean package + - name: Build scaleph-file-fetcher - name: Upload coverage to Codecov uses: codecov/codecov-action@v3 with: diff --git a/.github/workflows/ci-npm.yml b/.github/workflows/ci-npm.yml new file mode 100644 index 000000000..c78d6b889 --- /dev/null +++ b/.github/workflows/ci-npm.yml @@ -0,0 +1,44 @@ +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +name: CI-NPM + +on: + pull_request: + paths-ignore: ['docs/**', '**/*.md', '**/*.drawio', '**/*.svg' ] + push: + paths-ignore: ['docs/**', '**/*.md', '**/*.drawio', '**/*.svg' ] + schedule: + - cron: '0 20 * * *' # automatic test while every day on 04:00 am at UTC+10 + workflow_dispatch: + +jobs: + build: + if: github.repository == 'flowerfine/scaleph' + strategy: + matrix: + os: [ ubuntu-latest, macos-latest, windows-latest ] + runs-on: ${{ matrix.os }} + steps: + - name: checkout + uses: actions/checkout@v3 + with: + fetch-depth: 0 + - name: Build scaleph-ui-react-dist + run: mvn -B -U package -pl scaleph-ui-react -am -DskipTests + - name: Build with NPM + timeout-minutes: 360 + run: cd scaleph-ui-react && npm install && npm run build --prod \ No newline at end of file diff --git a/.github/workflows/release-dist-bin.yml b/.github/workflows/release-dist-bin.yml index 01ec6e4a7..9a7ab0fbf 100644 --- a/.github/workflows/release-dist-bin.yml +++ b/.github/workflows/release-dist-bin.yml @@ -1,3 +1,19 @@ +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + name: Release dist bin permissions: diff --git a/.github/workflows/docker-flink.yml b/.github/workflows/release-manual-docker-flink.yml similarity index 98% rename from .github/workflows/docker-flink.yml rename to .github/workflows/release-manual-docker-flink.yml index 74c0cd435..31d04e6cc 100644 --- a/.github/workflows/docker-flink.yml +++ b/.github/workflows/release-manual-docker-flink.yml @@ -14,7 +14,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -name: Docker-Build-Flink +name: Relase-Docker-Flink on: workflow_dispatch: diff --git a/.github/workflows/docker-seatunnel.yml b/.github/workflows/release-manual-docker-seatunnel.yml similarity index 98% rename from .github/workflows/docker-seatunnel.yml rename to .github/workflows/release-manual-docker-seatunnel.yml index 0455c0e28..dd123f0b9 100644 --- a/.github/workflows/docker-seatunnel.yml +++ b/.github/workflows/release-manual-docker-seatunnel.yml @@ -14,7 +14,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -name: Docker-Build-Seatunnel +name: Release-Docker-SeaTunnel on: workflow_dispatch: diff --git a/.github/workflows/docker-sql-template.yml b/.github/workflows/release-manual-docker-sql-template.yml similarity index 98% rename from .github/workflows/docker-sql-template.yml rename to .github/workflows/release-manual-docker-sql-template.yml index 446c69e15..a1ca226df 100644 --- a/.github/workflows/docker-sql-template.yml +++ b/.github/workflows/release-manual-docker-sql-template.yml @@ -14,7 +14,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -name: Docker-Build-Sql-Template +name: Release-Docker-Build-Sql-Template on: workflow_dispatch: diff --git a/.github/workflows/docker-release.yml b/.github/workflows/release-master-docker-scaleph.yml similarity index 63% rename from .github/workflows/docker-release.yml rename to .github/workflows/release-master-docker-scaleph.yml index d692b3f2e..4da639b64 100644 --- a/.github/workflows/docker-release.yml +++ b/.github/workflows/release-master-docker-scaleph.yml @@ -1,4 +1,20 @@ -name: Docker-Release +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +name: Release-Docker-Scaleph-Master on: workflow_dispatch: @@ -40,6 +56,9 @@ jobs: uses: docker/setup-qemu-action@v2 - name: Set up Docker Buildx uses: docker/setup-buildx-action@v2 + - name: Fetch Project Version + run: | + echo "PROJECT_VERSION=$(mvn help:evaluate -Dexpression=project.version -q -DforceStdout)" >>$GITHUB_ENV - name: Build scaleph-dist run: mvn -B -U -T 4C clean package -Pdist -DskipTests -Dfast - name: Build scaleph-ui-react-dist @@ -57,5 +76,5 @@ jobs: platforms: linux/amd64,linux/arm64 file: tools/docker/build/${{ matrix.image }}/Dockerfile tags: | - ${{ env.HUB }}/${{ matrix.image }}:${{ github.sha }}, + ${{ env.HUB }}/${{ matrix.image }}:${{ env.PROJECT_VERSION }}, ${{ env.HUB }}/${{ matrix.image }}:latest \ No newline at end of file diff --git a/.github/workflows/release.yml b/.github/workflows/release-tag-docker-scaleph.yml similarity index 65% rename from .github/workflows/release.yml rename to .github/workflows/release-tag-docker-scaleph.yml index a94156356..3869ac4e0 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release-tag-docker-scaleph.yml @@ -1,4 +1,20 @@ -name: Release +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +name: Release-Docker-Scaleph-Tag on: push: @@ -53,5 +69,5 @@ jobs: platforms: linux/amd64,linux/arm64 file: tools/docker/build/${{ matrix.image }}/Dockerfile tags: | - ${{ env.HUB }}/${{ matrix.image }}:${{ github.sha }}, - ${{ env.HUB }}/${{ matrix.image }}:${{ github.ref_name }} + ${{ env.HUB }}/${{ matrix.image }}:${{ github.ref_name }}, + ${{ env.HUB }}/${{ matrix.image }}:latest diff --git a/.github/workflows/sonarcloud.yml b/.github/workflows/sonarcloud.yml index 50d27293a..626536cde 100644 --- a/.github/workflows/sonarcloud.yml +++ b/.github/workflows/sonarcloud.yml @@ -1,3 +1,19 @@ +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + name: SonarCloud on: diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml deleted file mode 100644 index e91d4a97d..000000000 --- a/.github/workflows/test.yml +++ /dev/null @@ -1,28 +0,0 @@ -name: Test - -on: - push: - paths-ignore: ['docs/**', '**/*.md', '**/*.drawio', '**/*.svg' ] - -jobs: - build: -# only run on forked repository - if: github.repository != 'flowerfine/scaleph' - strategy: - matrix: - os: [ ubuntu-latest, macos-latest, windows-latest ] - jdk: [ 8, 11, 17 ] - runs-on: ${{ matrix.os }} - steps: - - name: checkout - uses: actions/checkout@v3 - with: - fetch-depth: 0 - - name: Setup Java JDK ${{ matrix.jdk }} - uses: actions/setup-java@v3 - with: - java-version: ${{ matrix.jdk }} - distribution: temurin - cache: maven - - name: Build with Maven - run: mvn -B -U -T 4 clean package --file pom.xml \ No newline at end of file diff --git a/.github/workflows/web-ide.yml b/.github/workflows/web-ide.yml index e7348d75e..ce366763b 100644 --- a/.github/workflows/web-ide.yml +++ b/.github/workflows/web-ide.yml @@ -1,3 +1,19 @@ +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + name: Web-IDE on: diff --git a/README.md b/README.md index 41b09eb8a..a045c801e 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ # scaleph -[![Gihub Actions](https://github.com/flowerfine/scaleph/actions/workflows/ci.yml/badge.svg?branch=master)](https://github.com/flowerfine/scaleph/actions) [![Total Lines](https://tokei.rs/b1/github/flowerfine/scaleph?category=lines)](https://github.com/flowerfine/scaleph) [![Last commit](https://img.shields.io/github/last-commit/flowerfine/scaleph.svg)](https://github.com/flowerfine/scaleph) [![Quality Gate Status](https://sonarcloud.io/api/project_badges/measure?project=flowerfine_scaleph&metric=sqale_rating)](https://sonarcloud.io/dashboard?id=flowerfine_scaleph) [![codecov](https://codecov.io/gh/flowerfine/scaleph/branch/master/graph/badge.svg)](https://codecov.io/gh/flowerfine/scaleph/branch/master) [![Docker](https://img.shields.io/badge/docker-%230db7ed.svg?style=flat&logo=docker&logoColor=white)](https://github.com/orgs/flowerfine/packages?repo_name=scaleph) +[![Gihub Actions](https://github.com/flowerfine/scaleph/actions/workflows/ci-maven.yml/badge.svg?branch=master)](https://github.com/flowerfine/scaleph/actions) [![Total Lines](https://tokei.rs/b1/github/flowerfine/scaleph?category=lines)](https://github.com/flowerfine/scaleph) [![Last commit](https://img.shields.io/github/last-commit/flowerfine/scaleph.svg)](https://github.com/flowerfine/scaleph) [![Quality Gate Status](https://sonarcloud.io/api/project_badges/measure?project=flowerfine_scaleph&metric=sqale_rating)](https://sonarcloud.io/dashboard?id=flowerfine_scaleph) [![codecov](https://codecov.io/gh/flowerfine/scaleph/branch/master/graph/badge.svg)](https://codecov.io/gh/flowerfine/scaleph/branch/master) [![Docker](https://img.shields.io/badge/docker-%230db7ed.svg?style=flat&logo=docker&logoColor=white)](https://github.com/orgs/flowerfine/packages?repo_name=scaleph) The Scaleph project features data integration, develop, job schedule and orchestration and aims to run on cloud environment. diff --git a/scaleph-api/src/main/resources/application-dev.yml b/scaleph-api/src/main/resources/application-dev.yml index 6157e7cd7..8462987fe 100644 --- a/scaleph-api/src/main/resources/application-dev.yml +++ b/scaleph-api/src/main/resources/application-dev.yml @@ -19,33 +19,33 @@ spring: datasource: master: driver-class-name: com.mysql.cj.jdbc.Driver - jdbc-url: jdbc:mysql://127.0.0.1:3306/scaleph?useUnicode=true&characterEncoding=UTF-8&serverTimezone=Asia/Shanghai&useAffectedRows=true - username: root - password: 123456 + jdbc-url: jdbc:mysql://${MYSQL_HOST:127.0.0.1}:${MYSQL_PORT:3306}/scaleph?useUnicode=true&characterEncoding=UTF-8&serverTimezone=Asia/Shanghai&useAffectedRows=true + username: ${MYSQL_USERNAME:root} + password: ${MYSQL_PASSWORD:123456} log: driver-class-name: com.mysql.cj.jdbc.Driver - jdbc-url: jdbc:mysql://127.0.0.1:3306/scaleph?useUnicode=true&characterEncoding=UTF-8&serverTimezone=Asia/Shanghai&useAffectedRows=true - username: root + jdbc-url: jdbc:mysql://${MYSQL_HOST:127.0.0.1}:${MYSQL_PORT:3306}/scaleph?useUnicode=true&characterEncoding=UTF-8&serverTimezone=Asia/Shanghai&useAffectedRows=true + username: ${MYSQL_USERNAME:root} password: 123456 sakura: driver-class-name: com.mysql.cj.jdbc.Driver - jdbc-url: jdbc:mysql://127.0.0.1:3306/sakura?useUnicode=true&characterEncoding=UTF-8&serverTimezone=Asia/Shanghai&useAffectedRows=true - username: root - password: 123456 + jdbc-url: jdbc:mysql://${MYSQL_HOST:127.0.0.1}:${MYSQL_PORT:3306}/sakura?useUnicode=true&characterEncoding=UTF-8&serverTimezone=Asia/Shanghai&useAffectedRows=true + username: ${MYSQL_USERNAME:root} + password: ${MYSQL_PASSWORD:123456} quartz: properties: org.quartz: dataSource: quartzDS: driver: com.mysql.cj.jdbc.Driver - URL: jdbc:mysql://127.0.0.1:3306/scaleph?useUnicode=true&characterEncoding=UTF-8&serverTimezone=Asia/Shanghai&useAffectedRows=true - user: root - password: 123456 + URL: jdbc:mysql://${MYSQL_HOST:127.0.0.1}:${MYSQL_PORT:3306}/scaleph?useUnicode=true&characterEncoding=UTF-8&serverTimezone=Asia/Shanghai&useAffectedRows=true + user: ${MYSQL_USERNAME:root} + password: ${MYSQL_PASSWORD:123456} redis: database: 0 - host: 127.0.0.1 - port: 6379 - password: 123456 + host: ${REDIS_HOST:127.0.0.1} + port: ${REDIS_PORT:6379} + password: ${REDIS_PASSWORD:123456} app: host: localhost:4200 @@ -55,9 +55,9 @@ file-system: type: s3 proxy: false bucket: ${spring.application.name} - endPoint: http://127.0.0.1:9000 - accessKey: admin - secretKey: password + endPoint: ${MINIO_ENDPOINT:http://127.0.0.1:9000} + accessKey: ${MINIO_ACCESS_KEY:admin} + secretKey: ${MINIO_SECRET_KEY:password} # type: oss # bucket: ${spring.application.name} # endPoint: Aliyun OSS endpoint to connect to diff --git a/tools/docker/build/scaleph-api/Dockerfile b/tools/docker/build/scaleph-api/Dockerfile index 7739a5343..1d44c0a4d 100644 --- a/tools/docker/build/scaleph-api/Dockerfile +++ b/tools/docker/build/scaleph-api/Dockerfile @@ -3,7 +3,8 @@ FROM $BASE_RELEASE_IMAGE as release ADD scaleph-dist/target/scaleph-*-bin.tar.gz /opt -ENV MYSQL_URL="jdbc:mysql://mysql:3306/scaleph?useUnicode=true&characterEncoding=UTF-8&serverTimezone=Asia/Shanghai" +ENV MYSQL_HOST=mysql +ENV MYSQL_PORT=3306 ENV MYSQL_USERNAME=root ENV MYSQL_PASSWORD=123456 ENV REDIS_HOST=redis @@ -16,26 +17,6 @@ ENV MINIO_SECRET_KEY=password ENV TZ Asia/Shanghai ENV SCALEPH_HOME /opt/scaleph -ENV ENV_PARAMS=" --spring.datasource.master.jdbc-url=$MYSQL_URL \ - --spring.datasource.master.username=$MYSQL_USERNAME \ - --spring.datasource.master.password=$MYSQL_PASSWORD \ - --spring.datasource.log.jdbc-url=$MYSQL_URL \ - --spring.datasource.log.username=$MYSQL_USERNAME \ - --spring.datasource.log.password=$MYSQL_PASSWORD \ - --spring.datasource.sakura.jdbc-url=$MYSQL_URL \ - --spring.datasource.sakura.username=$MYSQL_USERNAME \ - --spring.datasource.sakura.password=$MYSQL_PASSWORD \ - --spring.quartz.properties.org.quartz.dataSource.quartzDS.URL=$MYSQL_URL \ - --spring.quartz.properties.org.quartz.dataSource.quartzDS.user=$MYSQL_USERNAME \ - --spring.quartz.properties.org.quartz.dataSource.quartzDS.password=$MYSQL_PASSWORD \ - --spring.redis.host=$REDIS_HOST \ - --spring.redis.port=$REDIS_PORT \ - --spring.redis.password=$REDIS_PASSWORD \ - --file-system.endPoint=$MINIO_ENDPOINT \ - --file-system.accessKey=$MINIO_ACCESS_KEY \ - --file-system.secretKey=$MINIO_SECRET_KEY \ - " - RUN mkdir -p $SCALEPH_HOME WORKDIR $SCALEPH_HOME diff --git a/tools/docker/mysql/init.d/scaleph-ws-mysql.sql b/tools/docker/mysql/init.d/scaleph-ws-mysql.sql index 143bbd0bf..bef28558c 100644 --- a/tools/docker/mysql/init.d/scaleph-ws-mysql.sql +++ b/tools/docker/mysql/init.d/scaleph-ws-mysql.sql @@ -297,7 +297,7 @@ INSERT INTO `ws_flink_kubernetes_template`(`id`, `project_id`, `name`, `template `log_configuration`, `ingress`, additional_dependencies, `remark`, `creator`, `editor`) VALUES (4, 1, 'simple-seatunnel-deployment', '35e4a532-3c7b-4273-8cdb-edbef2cb9e49', 'FlinkDeployment', 'default', - '{"image":"ghcr.io/flowerfine/scaleph-seatunnel:2.3.1-flink-1.15","imagePullPolicy":"IfNotPresent","flinkVersion":"v1_15","serviceAccount":"flink"}', + '{"image":"ghcr.io/flowerfine/scaleph-seatunnel:2.3.3-flink-1.15","imagePullPolicy":"IfNotPresent","flinkVersion":"v1_15","serviceAccount":"flink"}', '{"resource":{"cpu":1.0,"memory":"1G"},"replicas":1}', '{"resource":{"cpu":1.0,"memory":"1G"},"replicas":1}', NULL,