Skip to content

Commit

Permalink
chore(release): 2024.4.0 (#883)
Browse files Browse the repository at this point in the history
  • Loading branch information
qianmoQ authored Dec 2, 2024
2 parents 6d1ea28 + f6a854c commit 34f1820
Show file tree
Hide file tree
Showing 124 changed files with 501 additions and 416 deletions.
8 changes: 4 additions & 4 deletions .github/workflows/publish-docker.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ env:
APP_NAME: datacap
GITHUB_REGISTRY: ghcr.io
APP_GITHUB_GROUP: devlive-community
APP_DOCKER_GROUP: qianmoq
APP_DOCKER_GROUP: devliveorg

jobs:
before-compile:
Expand Down Expand Up @@ -44,7 +44,7 @@ jobs:
with:
path: |
./Dockerfile
./dist/datacap-release.tar.gz
./dist/datacap-server-${{ needs.before-compile.outputs.APP_VERSION }}-bin.tar.gz
key: ${{ runner.os }}-build-${{ env.cache-name }}
restore-keys: ${{ runner.os }}-build-${{ env.cache-name }}

Expand All @@ -61,7 +61,7 @@ jobs:
with:
path: |
./Dockerfile
./dist/datacap-release.tar.gz
./dist/datacap-server-${{ needs.before-compile.outputs.APP_VERSION }}-bin.tar.gz
key: ${{ runner.os }}-build-${{ env.cache-name }}
restore-keys: ${{ runner.os }}-build-${{ env.cache-name }}

Expand Down Expand Up @@ -100,7 +100,7 @@ jobs:
with:
path: |
./Dockerfile
./dist/datacap-release.tar.gz
./dist/datacap-server-${{ needs.before-compile.outputs.APP_VERSION }}-bin.tar.gz
key: ${{ runner.os }}-build-${{ env.cache-name }}
restore-keys: ${{ runner.os }}-build-${{ env.cache-name }}

Expand Down
13 changes: 7 additions & 6 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,15 +1,16 @@
FROM eclipse-temurin:11-jdk-focal
MAINTAINER qianmoQ "[email protected]"

LABEL org.opencontainers.image.description DESCRIPTION
LABEL maintainer="[email protected]" \
description="DataCap Server Image"

# Add datacap
RUN mkdir -p /opt/app
ADD dist/datacap-release.tar.gz /opt/app/
ADD --chown=root:root dist/datacap-server-*.tar.gz /opt/app/
RUN cd /opt/app && \
mv datacap-server-* datacap

WORKDIR /opt/app/datacap

# expose our default runtime port
EXPOSE 9096

# run it
ENTRYPOINT ["sh", "./bin/debug.sh"]
ENTRYPOINT ["sh", "./bin/debug.sh"]
2 changes: 1 addition & 1 deletion client/datacap-cli/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<parent>
<groupId>io.edurt.datacap</groupId>
<artifactId>datacap</artifactId>
<version>2024.4.0-SNAPSHOT</version>
<version>2024.4.0</version>
<relativePath>../../pom.xml</relativePath>
</parent>

Expand Down
26 changes: 13 additions & 13 deletions configure/etc/bin/install-plugin.sh
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
#!/bin/sh

HOME=$(pwd)
VERSION=2024.4.0-SNAPSHOT
CDN_CENTER="https://cdn.north.devlive.org/applications/datacap/plugins/${VERSION}"
VERSION=2024.4.0
CDN_CENTER="https://repo1.maven.org/maven2/io/edurt/datacap"

install_package() {
DOWNLOAD_URL=$1
Expand Down Expand Up @@ -31,14 +31,13 @@ install_package() {

process_section() {
SECTION=$1
TYPE=$2

if [ ! -d "${HOME}/plugins" ]; then
mkdir "${HOME}/plugins"
echo "Create plugins directory"
fi

echo "Installing $TYPE components, version: ${VERSION}"
echo "Installing components from section: ${SECTION}, version: ${VERSION}"
IN_SECTION=0

while IFS= read -r line; do
Expand All @@ -50,8 +49,9 @@ process_section() {
fi

if [ $IN_SECTION -eq 1 ] && [ ! -z "$line" ] && [[ ! "$line" =~ ^--.*$ ]]; then
DOWNLOAD_URL="${CDN_CENTER}/${TYPE}/${line}-bin.tar.gz"
echo "Installing ${TYPE} from: $DOWNLOAD_URL"
COMPONENT_NAME="$line"
DOWNLOAD_URL="${CDN_CENTER}/${COMPONENT_NAME}/${VERSION}/${COMPONENT_NAME}-bin.tar.gz"
echo "Installing from: $DOWNLOAD_URL"
install_package "$DOWNLOAD_URL" "${HOME}/plugins"
fi
done < "${HOME}/configure/plugin.conf"
Expand All @@ -61,12 +61,12 @@ echo "========== Starting installation =========="
echo "Version: ${VERSION}"
echo "CDN Center: ${CDN_CENTER}"

process_section "Plugin" "plugin"
process_section "Scheduler" "scheduler"
process_section "Parser" "parser"
process_section "Notify" "notify"
process_section "Fs" "fs"
process_section "Convert" "convert"
process_section "Executor" "executor"
process_section "Plugin"
process_section "Scheduler"
process_section "Parser"
process_section "Notify"
process_section "Fs"
process_section "Convert"
process_section "Executor"

echo "========== Installation complete =========="
2 changes: 1 addition & 1 deletion configure/etc/conf/application.properties
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
################################### Banner configure #################################
app.version=2024.4.0-SNAPSHOT
app.version=2024.4.0

################################### Basic configure #################################
server.port=9096
Expand Down
3 changes: 3 additions & 0 deletions configure/etc/conf/plugin.conf
Original file line number Diff line number Diff line change
Expand Up @@ -57,8 +57,11 @@ datacap-plugin-neo4j
datacap-scheduler-local

-- Parser list --
datacap-parser-mysql
datacap-parser-trino

-- Notify list --
datacap-notify-dingtalk

-- Fs list --
datacap-fs-local
Expand Down
Loading

0 comments on commit 34f1820

Please sign in to comment.