Skip to content

Commit

Permalink
build: update project version to 0.8.0-SNAPSHOT (#421)
Browse files Browse the repository at this point in the history
Co-authored-by: aqni <[email protected]>
  • Loading branch information
github-actions[bot] and aqni authored Aug 9, 2024
1 parent 5e1fec5 commit f1ee5ef
Show file tree
Hide file tree
Showing 32 changed files with 36 additions and 36 deletions.
2 changes: 1 addition & 1 deletion docker/client/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ WORKDIR /root/iginx
RUN mvn clean package -pl client -am -Dmaven.test.skip=true -P-format -e

FROM openjdk:11-jre-slim
COPY --from=builder /root/iginx/client/target/iginx-client-0.7.1/ /iginx_client/
COPY --from=builder /root/iginx/client/target/iginx-client-0.8.0-SNAPSHOT/ /iginx_client/

RUN mkdir -p /iginx_client/logs
RUN mkdir -p /iginx_client/data
Expand Down
2 changes: 1 addition & 1 deletion docker/client/Dockerfile-no-maven
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
FROM openjdk:11-jre-slim
COPY ./target/iginx-client-0.7.1/ /iginx_client/
COPY ./target/iginx-client-0.8.0-SNAPSHOT/ /iginx_client/

RUN mkdir -p /iginx_client/logs
RUN mkdir -p /iginx_client/data
Expand Down
2 changes: 1 addition & 1 deletion docker/client/Dockerfile-no-maven-windows
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
FROM mcr.microsoft.com/windows/servercore:ltsc2022
COPY . C:/iginx
WORKDIR C:/iginx
COPY ./target/iginx-client-0.7.1/ C:/iginx_client
COPY ./target/iginx-client-0.8.0-SNAPSHOT/ C:/iginx_client

# 设置环境变量
USER ContainerAdministrator
Expand Down
2 changes: 1 addition & 1 deletion docker/client/build-no-maven.bat
Original file line number Diff line number Diff line change
Expand Up @@ -16,4 +16,4 @@
@REM along with this program. If not, see <http://www.gnu.org/licenses/>.
@REM

docker build --file Dockerfile-no-maven-windows -t iginx-client:0.7.1 ../../client
docker build --file Dockerfile-no-maven-windows -t iginx-client:0.8.0-SNAPSHOT ../../client
2 changes: 1 addition & 1 deletion docker/client/build-no-maven.sh
Original file line number Diff line number Diff line change
Expand Up @@ -17,4 +17,4 @@
# along with this program. If not, see <http://www.gnu.org/licenses/>.
#

docker build --file Dockerfile-no-maven -t iginx-client:0.7.1 ../../client
docker build --file Dockerfile-no-maven -t iginx-client:0.8.0-SNAPSHOT ../../client
2 changes: 1 addition & 1 deletion docker/client/build.bat
Original file line number Diff line number Diff line change
Expand Up @@ -16,4 +16,4 @@
@REM along with this program. If not, see <http://www.gnu.org/licenses/>.
@REM

docker build --file Dockerfile -t iginx-client:0.7.1 ../../client
docker build --file Dockerfile -t iginx-client:0.8.0-SNAPSHOT ../../client
2 changes: 1 addition & 1 deletion docker/client/build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -17,4 +17,4 @@
# along with this program. If not, see <http://www.gnu.org/licenses/>.
#

docker build --file Dockerfile -t iginx-client:0.7.1 ../../client
docker build --file Dockerfile -t iginx-client:0.8.0-SNAPSHOT ../../client
2 changes: 1 addition & 1 deletion docker/client/run_docker.bat
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ if not exist "%datadir%" (
mkdir "%datadir%"
)

set command=docker run --name="%name%" -dit --add-host=host.docker.internal:host-gateway --mount type=bind,source=!datadir!,target=C:/iginx_client/data iginx-client:0.7.1
set command=docker run --name="%name%" -dit --add-host=host.docker.internal:host-gateway --mount type=bind,source=!datadir!,target=C:/iginx_client/data iginx-client:0.8.0-SNAPSHOT
echo %command%
%command%

Expand Down
2 changes: 1 addition & 1 deletion docker/client/run_docker.sh
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,6 @@ done

[ -d "$datadir" ] || mkdir -p "$datadir"

command="docker run --name=\"$name\" --privileged -dit --add-host=host.docker.internal:host-gateway --mount type=bind,source=${datadir},target=/iginx_client/data iginx-client:0.7.1"
command="docker run --name=\"$name\" --privileged -dit --add-host=host.docker.internal:host-gateway --mount type=bind,source=${datadir},target=/iginx_client/data iginx-client:0.8.0-SNAPSHOT"
echo $command
eval $command
2 changes: 1 addition & 1 deletion docker/onlyIginx-parquet/Dockerfile-iginx
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ WORKDIR /root/iginx
RUN mvn clean package -DskipTests -P-format -e

FROM openjdk:11-jre-slim
COPY --from=builder /root/iginx/core/target/iginx-core-0.7.1 /iginx
COPY --from=builder /root/iginx/core/target/iginx-core-0.8.0-SNAPSHOT /iginx

# ports will be cast in run.bat

Expand Down
2 changes: 1 addition & 1 deletion docker/onlyIginx-parquet/build_iginx_docker.bat
Original file line number Diff line number Diff line change
Expand Up @@ -16,4 +16,4 @@
@REM along with this program. If not, see <http://www.gnu.org/licenses/>.
@REM

docker build --file Dockerfile-iginx -t iginx:0.7.1 ../..
docker build --file Dockerfile-iginx -t iginx:0.8.0-SNAPSHOT ../..
2 changes: 1 addition & 1 deletion docker/onlyIginx-parquet/build_iginx_docker.sh
Original file line number Diff line number Diff line change
Expand Up @@ -17,4 +17,4 @@
# along with this program. If not, see <http://www.gnu.org/licenses/>.
#

docker build --file Dockerfile-iginx -t iginx:0.7.1 ../..
docker build --file Dockerfile-iginx -t iginx:0.8.0-SNAPSHOT ../..
2 changes: 1 addition & 1 deletion docker/onlyIginx-parquet/run_iginx_docker.bat
Original file line number Diff line number Diff line change
Expand Up @@ -180,7 +180,7 @@ if "!network!" neq "null" (

set "configFileConfig=-v !localConfigFile!:/iginx/conf "
@REM
set command=docker run --name="%name%" !network!!localIPConfig!!configFileConfig!--privileged -dit -e host_iginx_port=%hostPort% -p %hostPort%:!port! !engineCast!iginx:0.7.1
set command=docker run --name="%name%" !network!!localIPConfig!!configFileConfig!--privileged -dit -e host_iginx_port=%hostPort% -p %hostPort%:!port! !engineCast!iginx:0.8.0-SNAPSHOT
echo %command%
%command%

Expand Down
2 changes: 1 addition & 1 deletion docker/onlyIginx-parquet/run_iginx_docker.sh
Original file line number Diff line number Diff line change
Expand Up @@ -139,6 +139,6 @@ fi

configFileConfig="-v ${localConfigFile}:/iginx/conf/config.properties "

command="docker run --name=${name} ${localIPConfig}${configFileConfig}--add-host=host.docker.internal:host-gateway ${network}--privileged -dit -e host_iginx_port=${hostPort}${portCastParams} iginx:0.7.1"
command="docker run --name=${name} ${localIPConfig}${configFileConfig}--add-host=host.docker.internal:host-gateway ${network}--privileged -dit -e host_iginx_port=${hostPort}${portCastParams} iginx:0.8.0-SNAPSHOT"
echo "RUNNING ${command}"
# ${command}
2 changes: 1 addition & 1 deletion docker/onlyIginx/Dockerfile-iginx
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ WORKDIR /root/iginx
RUN mvn clean package -DskipTests -P-format

FROM openjdk:11-jre-slim
COPY --from=builder /root/iginx/core/target/iginx-core-0.7.1 /iginx
COPY --from=builder /root/iginx/core/target/iginx-core-0.8.0-SNAPSHOT /iginx
# 安装 Python 3.8, pip 并安装所需的 Python 包

RUN apt-get update && \
Expand Down
2 changes: 1 addition & 1 deletion docker/onlyIginx/build_iginx_docker.bat
Original file line number Diff line number Diff line change
Expand Up @@ -16,4 +16,4 @@
@REM along with this program. If not, see <http://www.gnu.org/licenses/>.
@REM

docker build --file Dockerfile-iginx -t iginx:0.7.1 ../..
docker build --file Dockerfile-iginx -t iginx:0.8.0-SNAPSHOT ../..
2 changes: 1 addition & 1 deletion docker/onlyIginx/build_iginx_docker.sh
Original file line number Diff line number Diff line change
Expand Up @@ -16,4 +16,4 @@
# along with this program. If not, see <http://www.gnu.org/licenses/>.
#

docker build --file Dockerfile-iginx -t iginx:0.7.1 ../..
docker build --file Dockerfile-iginx -t iginx:0.8.0-SNAPSHOT ../..
2 changes: 1 addition & 1 deletion docker/onlyIginx/run_iginx_docker.bat
Original file line number Diff line number Diff line change
Expand Up @@ -29,4 +29,4 @@ set ip=%1
set name=%2
set port=%3
mkdir -p logs/docker_logs
docker run --name="%name%" --privileged -dit --net docker-cluster-iginx --ip %ip% --add-host=host.docker.internal:host-gateway -v %logdir%:/iginx/logs/ -p %port%:6888 iginx:0.7.1
docker run --name="%name%" --privileged -dit --net docker-cluster-iginx --ip %ip% --add-host=host.docker.internal:host-gateway -v %logdir%:/iginx/logs/ -p %port%:6888 iginx:0.8.0-SNAPSHOT
2 changes: 1 addition & 1 deletion docker/onlyIginx/run_iginx_docker.sh
Original file line number Diff line number Diff line change
Expand Up @@ -21,4 +21,4 @@ name=$2
port=$3
logdir="$(pwd)/../../logs/docker_logs"
mkdir -p $logdir
docker run --name="${name}" --privileged -dit --net docker-cluster-iginx --ip ${ip} --add-host=host.docker.internal:host-gateway -v ${logdir}:/iginx/logs/ -p ${port}:6888 iginx:0.7.1
docker run --name="${name}" --privileged -dit --net docker-cluster-iginx --ip ${ip} --add-host=host.docker.internal:host-gateway -v ${logdir}:/iginx/logs/ -p ${port}:6888 iginx:0.8.0-SNAPSHOT
Binary file modified docs/pdf/SQLManual.pdf
Binary file not shown.
Binary file modified docs/pdf/userManualC.pdf
Binary file not shown.
2 changes: 1 addition & 1 deletion docs/quickStarts/IGinXByDocker-EnglishVersion.md
Original file line number Diff line number Diff line change
Expand Up @@ -255,7 +255,7 @@ The following words are displayed to indicate that the image was built successfu
=> [builder 2/4] COPY . /root/iginx 1.3s
=> [builder 3/4] WORKDIR /root/iginx 0.1s
=> [builder 4/4] RUN mvn clean package -DskipTests -P-format 876.3s
=> [stage-1 2/2] COPY --from=builder /root/iginx/core/target/iginx-core-0.7.1 /iginx 0.2s
=> [stage-1 2/2] COPY --from=builder /root/iginx/core/target/iginx-core-0.8.0-SNAPSHOT /iginx 0.2s
=> exporting to image 0.5s
=> => exporting layers 0.5s
=> => writing image sha256:e738348598c9db601dbf39c7a8ca9e1396c5ff51769afeb0fe3da12e2fdcd73a 0.0s
Expand Down
2 changes: 1 addition & 1 deletion docs/quickStarts/IGinXByDocker.md
Original file line number Diff line number Diff line change
Expand Up @@ -254,7 +254,7 @@ $ ./build_iginx_docker.sh
=> [builder 2/4] COPY . /root/iginx 1.3s
=> [builder 3/4] WORKDIR /root/iginx 0.1s
=> [builder 4/4] RUN mvn clean package -DskipTests -P-format 876.3s
=> [stage-1 2/2] COPY --from=builder /root/iginx/core/target/iginx-core-0.7.1 /iginx 0.2s
=> [stage-1 2/2] COPY --from=builder /root/iginx/core/target/iginx-core-0.8.0-SNAPSHOT /iginx 0.2s
=> exporting to image 0.5s
=> => exporting layers 0.5s
=> => writing image sha256:e738348598c9db601dbf39c7a8ca9e1396c5ff51769afeb0fe3da12e2fdcd73a 0.0s
Expand Down
2 changes: 1 addition & 1 deletion docs/quickStarts/IGinXBySource-EnglishVersion.md
Original file line number Diff line number Diff line change
Expand Up @@ -180,7 +180,7 @@ The following words are displayed, indicating that the IGinX build is successful

```shell
[INFO] ------------------------------------------------------------------------
[INFO] Reactor Summary for IGinX 0.7.1:
[INFO] Reactor Summary for IGinX 0.8.0-SNAPSHOT:
[INFO]
[INFO] IGinX .............................................. SUCCESS [ 20.674 s]
[INFO] IGinX Thrift ....................................... SUCCESS [01:18 min]
Expand Down
4 changes: 2 additions & 2 deletions docs/quickStarts/IGinXBySource.md
Original file line number Diff line number Diff line change
Expand Up @@ -180,7 +180,7 @@ $ mvn clean install -Dmaven.test.skip=true

```shell
[INFO] ------------------------------------------------------------------------
[INFO] Reactor Summary for IGinX 0.7.1:
[INFO] Reactor Summary for IGinX 0.8.0-SNAPSHOT:
[INFO]
[INFO] IGinX .............................................. SUCCESS [ 20.674 s]
[INFO] IGinX Thrift ....................................... SUCCESS [01:18 min]
Expand Down Expand Up @@ -257,7 +257,7 @@ Starting zookeeper ... STARTED

```shell
$ cd ~
$ cd IGinX/core/target/iginx-core-0.7.1
$ cd IGinX/core/target/iginx-core-0.8.0-SNAPSHOT
$ chmod +x sbin/start_iginx.sh # 为启动脚本添加启动权限
$ ./sbin/start_iginx.sh
```
Expand Down
6 changes: 3 additions & 3 deletions docs/quickStarts/IGinXZeppelin-EnglishVersion.md
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ Navigate to the IGinX directory and execute the following command to build the I
mvn clean package -DskipTests -P get-jar-with-dependencies
```

Upon successful compilation, you will find the `zeppelin-iginx-0.7.1-jar-with-dependencies.jar` package in the `IGinX/zeppelin-interpreter/target/` directory. We will need this package for the next steps of deploying Zeppelin.
Upon successful compilation, you will find the `zeppelin-iginx-0.8.0-SNAPSHOT-jar-with-dependencies.jar` package in the `IGinX/zeppelin-interpreter/target/` directory. We will need this package for the next steps of deploying Zeppelin.

## Deploying Zeppelin

Expand Down Expand Up @@ -56,7 +56,7 @@ export JAVA_HOME=

#### Integrating IGinX Zeppelin Interpreter

In the `zeppelin-0.10.1-bin-netinst/interpreter/` folder, create a new folder named `IGinX`. Place the compiled `zeppelin-iginx-0.7.1-jar-with-dependencies.jar` package inside this folder.
In the `zeppelin-0.10.1-bin-netinst/interpreter/` folder, create a new folder named `IGinX`. Place the compiled `zeppelin-iginx-0.8.0-SNAPSHOT-jar-with-dependencies.jar` package inside this folder.

#### Starting IGinX

Expand Down Expand Up @@ -86,7 +86,7 @@ Before deploying Zeppelin, start IGinX.

Prepare a folder to place the IGinX Zeppelin Interpreter. For example, let's name the folder `zeppelin-interpreter` with the absolute path `~/code/zeppelin-interpreter/`.

Place the `zeppelin-iginx-0.7.1-jar-with-dependencies.jar` package inside this prepared `zeppelin-interpreter` folder.
Place the `zeppelin-iginx-0.8.0-SNAPSHOT-jar-with-dependencies.jar` package inside this prepared `zeppelin-interpreter` folder.

#### Starting Docker Container Using Commands

Expand Down
6 changes: 3 additions & 3 deletions docs/quickStarts/IGinXZeppelin.md
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
mvn clean package -DskipTests -P get-jar-with-dependencies
```

构建成功后,在`IGinX/zeppelin-interpreter/target/`路径下找到`zeppelin-iginx-0.7.1-jar-with-dependencies.jar`包。
构建成功后,在`IGinX/zeppelin-interpreter/target/`路径下找到`zeppelin-iginx-0.8.0-SNAPSHOT-jar-with-dependencies.jar`包。

在下一步部署Zeppelin时我们需要用到这个包。

Expand Down Expand Up @@ -60,7 +60,7 @@ export JAVA_HOME=

#### 接入IGinX Zeppelin Interpreter

`zeppelin-0.10.1-bin-netinst/interpreter/`文件夹下新建一个文件夹`IGinX`,将构建好的`zeppelin-iginx-0.7.1-jar-with-dependencies.jar`包放入其中即可。
`zeppelin-0.10.1-bin-netinst/interpreter/`文件夹下新建一个文件夹`IGinX`,将构建好的`zeppelin-iginx-0.8.0-SNAPSHOT-jar-with-dependencies.jar`包放入其中即可。

#### 启动IGinX

Expand Down Expand Up @@ -90,7 +90,7 @@ export JAVA_HOME=

我们需要准备一个文件夹,用于放置IGinX Zeppelin Interpreter。例如我们准备一个文件夹名为`zeppelin-interpreter`,其绝对路径为`~/code/zeppelin-interpreter/`

`zeppelin-iginx-0.7.1-jar-with-dependencies.jar`包放入我们准备好的`zeppelin-interpreter`文件夹内即可。
`zeppelin-iginx-0.8.0-SNAPSHOT-jar-with-dependencies.jar`包放入我们准备好的`zeppelin-interpreter`文件夹内即可。

#### 使用命令启动Docker容器

Expand Down
2 changes: 1 addition & 1 deletion docs/quickStarts_Parquet/IGinXByDocker-EnglishVersion.md
Original file line number Diff line number Diff line change
Expand Up @@ -250,7 +250,7 @@ The following words are displayed to indicate that the image was built successfu
=> [builder 2/4] COPY . /root/iginx 1.3s
=> [builder 3/4] WORKDIR /root/iginx 0.1s
=> [builder 4/4] RUN mvn clean package -DskipTests -P passFormat 876.3s
=> [stage-1 2/2] COPY --from=builder /root/iginx/core/target/iginx-core-0.7.1 /iginx 0.2s
=> [stage-1 2/2] COPY --from=builder /root/iginx/core/target/iginx-core-0.8.0-SNAPSHOT /iginx 0.2s
=> exporting to image 0.5s
=> => exporting layers 0.5s
=> => writing image sha256:e738348598c9db601dbf39c7a8ca9e1396c5ff51769afeb0fe3da12e2fdcd73a 0.0s
Expand Down
2 changes: 1 addition & 1 deletion docs/quickStarts_Parquet/IGinXByDocker.md
Original file line number Diff line number Diff line change
Expand Up @@ -249,7 +249,7 @@ $ ./build_iginx_docker.sh
=> [builder 2/4] COPY . /root/iginx 1.3s
=> [builder 3/4] WORKDIR /root/iginx 0.1s
=> [builder 4/4] RUN mvn clean package -DskipTests -P passFormat 876.3s
=> [stage-1 2/2] COPY --from=builder /root/iginx/core/target/iginx-core-0.7.1 /iginx 0.2s
=> [stage-1 2/2] COPY --from=builder /root/iginx/core/target/iginx-core-0.8.0-SNAPSHOT /iginx 0.2s
=> exporting to image 0.5s
=> => exporting layers 0.5s
=> => writing image sha256:e738348598c9db601dbf39c7a8ca9e1396c5ff51769afeb0fe3da12e2fdcd73a 0.0s
Expand Down
2 changes: 1 addition & 1 deletion docs/quickStarts_Parquet/IGinXBySource-EnglishVersion.md
Original file line number Diff line number Diff line change
Expand Up @@ -168,7 +168,7 @@ The following words are displayed, indicating that the IGinX build is successful

```shell
[INFO] ------------------------------------------------------------------------
[INFO] Reactor Summary for IGinX 0.7.1:
[INFO] Reactor Summary for IGinX 0.8.0-SNAPSHOT:
[INFO]
[INFO] IGinX .............................................. SUCCESS [ 20.674 s]
[INFO] IGinX Thrift ....................................... SUCCESS [01:18 min]
Expand Down
4 changes: 2 additions & 2 deletions docs/quickStarts_Parquet/IGinXBySource.md
Original file line number Diff line number Diff line change
Expand Up @@ -170,7 +170,7 @@ $ mvn clean install -Dmaven.test.skip=true

```shell
[INFO] ------------------------------------------------------------------------
[INFO] Reactor Summary for IGinX 0.7.1:
[INFO] Reactor Summary for IGinX 0.8.0-SNAPSHOT:
[INFO]
[INFO] IGinX .............................................. SUCCESS [ 20.674 s]
[INFO] IGinX Thrift ....................................... SUCCESS [01:18 min]
Expand Down Expand Up @@ -232,7 +232,7 @@ storageEngineList=127.0.0.1#6667#parquet#dir=parquetData#has_data=false#is_read_

```shell
$ cd ~
$ cd IGinX/core/target/iginx-core-0.7.1
$ cd IGinX/core/target/iginx-core-0.8.0-SNAPSHOT
$ chmod +x sbin/start_iginx.sh # 为启动脚本添加启动权限
$ ./sbin/start_iginx.sh
```
Expand Down
2 changes: 1 addition & 1 deletion pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@
<maven.compiler.target>8</maven.compiler.target>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
<revision>0.7.1</revision>
<revision>0.8.0-SNAPSHOT</revision>
</properties>

<dependencyManagement>
Expand Down

0 comments on commit f1ee5ef

Please sign in to comment.