update site Docker (#167)

* update site Docker

* add aliyun plugin

* fetch lfs file

* support jdk 17

* remove lfs

.github/workflows/build.yml

@@ -13,14 +13,16 @@ jobs:
     runs-on: ${{ matrix.os }}
     strategy:
       matrix:
-        os: [ubuntu-20.04, macos-12]
+        os: [ubuntu-20.04, macos-13]
     steps:
       - uses: actions/checkout@v2
         with:
           fetch-depth: 5
       - name: install macOS dependencies
         if: runner.os == 'macOS'
-        run: brew install openjdk
+        run: |
+          brew install openjdk
+          java -version
       - name: install Ubuntu dependencies
         if: runner.os == 'Linux'
         run: sudo apt-get update && sudo apt install -y git curl default-jdk build-essential
@@ -32,7 +34,7 @@ jobs:
     runs-on: ${{ matrix.os }}
     strategy:
       matrix:
-        os: [ubuntu-20.04, macos-12]
+        os: [ubuntu-20.04, macos-13]
     steps:
       - uses: actions/checkout@v4
       - name: Use Node.js
@@ -48,7 +50,7 @@ jobs:
     runs-on: ${{ matrix.os }}
     strategy:
       matrix:
-        os: [macos-12]
+        os: [macos-13]
     steps:
       - uses: actions/checkout@v4
       - name: Use Node.js

build.gradle

@@ -4,7 +4,7 @@ plugins {
     id 'java-library'
     id 'java'
     id 'org.ajoberstar.grgit' version '4.1.1'
-    id 'com.github.sherter.google-java-format' version '0.8'
+    id 'com.github.sherter.google-java-format' version '0.9'
 }
 println("* Notice: current gradle version is " + gradle.gradleVersion)
 // Additional attribute definition
@@ -104,6 +104,7 @@ allprojects {
     apply plugin: 'com.github.sherter.google-java-format'
     apply plugin: 'idea'
     apply plugin: 'eclipse'
+    apply plugin: 'java-library'
     apply plugin: 'java'
     apply plugin: 'jacoco'
     apply plugin: 'signing'
@@ -157,10 +158,10 @@ allprojects {
     }
 
     dependencies {
-        implementation logger
-        implementation("org.projectlombok:lombok:${lombokVersion}")
-        implementation("org.apache.commons:commons-lang3:${apacheCommonLangVersion}")
-        implementation("com.google.guava:guava:${guavaVersion}")
+        api logger
+        api("org.projectlombok:lombok:${lombokVersion}")
+        api("org.apache.commons:commons-lang3:${apacheCommonLangVersion}")
+        api("com.google.guava:guava:${guavaVersion}")
 
         testImplementation ("junit:junit:${junitVersion}")
         annotationProcessor("org.projectlombok:lombok:${lombokVersion}")
@@ -193,7 +194,7 @@ subprojects {
     sourceCompatibility = 1.8
     targetCompatibility = 1.8
     googleJavaFormat {
-        //toolVersion = '1.7'
+        toolVersion = '1.7'
         options style: 'AOSP'
         source = sourceSets*.allJava
         include '**/*.java'

docker-files/base/Dockerfile

@@ -4,7 +4,7 @@ FROM ubuntu:18.04
 RUN apt-get update && apt-get install -y tzdata language-pack-zh* \
     && ln -fs /usr/share/zoneinfo/Asia/Shanghai /etc/localtime && echo 'Asia/Shanghai' >/etc/timezone  \
     && locale-gen zh_CN.UTF-8  \
-    && apt-get install -y  git wget tar unzip lzip vim nasm python3.8 python3-pip python3.8-dev perl graphviz openjdk-8-jdk gcc g++ build-essential m4 tcpdump net-tools gdb libkrb5-dev krb5-user pkg-config default-libmysqlclient-dev\
+    && apt-get install -y  git wget fontconfig tar unzip lzip vim nasm python3.8 python3-pip python3.8-dev perl graphviz openjdk-8-jdk gcc g++ build-essential m4 tcpdump net-tools gdb libkrb5-dev krb5-user pkg-config default-libmysqlclient-dev\
     && rm -f /usr/bin/python && ln -s /usr/bin/python3.8 /usr/bin/python  \
     && rm -f /usr/bin/python3 && ln -s /usr/bin/python3.8 /usr/bin/python3  \
     && ln -s /usr/bin/pip3 /usr/bin/pip

docker-files/site/Dockerfile

@@ -0,0 +1,38 @@
+# the builder
+FROM wedpr-jupyter-image:latest as builder
+
+LABEL maintainer [email protected]
+
+WORKDIR /
+
+ARG SOURCE_BRANCH
+ENV DEBIAN_FRONTEND=noninteractive \
+    SOURCE=${SOURCE_BRANCH:-main}
+
+RUN git clone  https://github.com/WeBankBlockchain/WeDPR.git -b ${SOURCE} \
+    && cd WeDPR && bash gradlew clean build
+
+# the wedpr-worker
+FROM wedpr-jupyter-image:latest as wedpr-jupyter-worker
+LABEL maintainer [email protected]
+
+RUN mkdir -p /data/app/
+COPY --from=builder /WeDPR/wedpr-worker/dist/ /data/app/wedpr-worker
+ENTRYPOINT ["/bin/bash"]
+
+# the wedpr-pir
+FROM wedpr-image:latest as wedpr-pir
+LABEL maintainer [email protected]
+
+RUN mkdir -p /data/app/
+COPY --from=builder /WeDPR/wedpr-pir/dist/ /data/app/wedpr-pir
+ENTRYPOINT ["/bin/bash"]
+
+# the wedpr-site
+FROM wedpr-image:latest as wedpr-site
+LABEL maintainer [email protected]
+
+RUN mkdir -p /data/app/
+COPY --from=builder /WeDPR/wedpr-site/dist/ /data/app/wedpr-site
+# TODO: fetch the web package from github tag
+ENTRYPOINT ["/bin/bash"]

gradle/wrapper/gradle-wrapper.properties

@@ -1,7 +1,7 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-#distributionUrl=https\://mirrors.cloud.tencent.com/gradle/gradle-7.3-bin.zip
-distributionUrl=https\://mirrors.cloud.tencent.com/gradle/gradle-6.3-bin.zip
+distributionUrl=https\://mirrors.cloud.tencent.com/gradle/gradle-7.3-bin.zip
+#distributionUrl=https\://mirrors.cloud.tencent.com/gradle/gradle-6.3-bin.zip
 #distributionUrl=https\://services.gradle.org/distributions/gradle-6.7-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

settings.gradle

@@ -1,3 +1,11 @@
+pluginManagement {
+    println "aliyun pluginManagement"
+    repositories {
+            maven { url "https://maven.aliyun.com/repository/gradle-plugin" }
+            maven { url "https://maven.aliyun.com/repository/spring-plugin" }
+            gradlePluginPortal()
+    }
+}
 rootProject.name = "WeDPR";
 
 

wedpr-common/protocol/build.gradle

@@ -3,5 +3,5 @@ plugins {
     id 'java'
 }
 dependencies {
-    compile project(':wedpr-common-utils')
+    api project(':wedpr-common-utils')
 }

wedpr-common/utils/build.gradle

@@ -4,7 +4,7 @@ plugins {
 }
 
 dependencies {
-    compile ("com.fasterxml.jackson.core:jackson-databind:${jacksonVersion}")
-    compile ("com.opencsv:opencsv:${opencsvVersion}")
+    api ("com.fasterxml.jackson.core:jackson-databind:${jacksonVersion}")
+    api ("com.opencsv:opencsv:${opencsvVersion}")
 }
 

wedpr-components/api-credential/build.gradle

@@ -3,7 +3,7 @@ plugins {
     id 'java'
 }
 dependencies{
-    compile project(":wedpr-components-mybatis")
-    compile project(":wedpr-components-uuid")
-    compile project(":wedpr-components-crypto")
+    api project(":wedpr-components-mybatis")
+    api project(":wedpr-components-uuid")
+    api project(":wedpr-components-crypto")
 }

wedpr-components/authorization/build.gradle

@@ -3,8 +3,8 @@ plugins {
     id 'java'
 }
 dependencies{
-    compile project(":wedpr-components-mybatis")
-    compile project(":wedpr-components-uuid")
-    compile project(":wedpr-components-sync")
-    compile project(":wedpr-components-resource-follower")
+    api project(":wedpr-components-mybatis")
+    api project(":wedpr-components-uuid")
+    api project(":wedpr-components-sync")
+    api project(":wedpr-components-resource-follower")
 }

wedpr-components/blockchain/build.gradle

@@ -4,8 +4,8 @@ plugins {
 }
 
 dependencies {
-    compile project(":wedpr-common-utils")
-    compile ("org.fisco-bcos.java-sdk:fisco-bcos-java-sdk:${bcosSDKVersion}"){
+    api project(":wedpr-common-utils")
+    api ("org.fisco-bcos.java-sdk:fisco-bcos-java-sdk:${bcosSDKVersion}"){
         exclude group: "org.slf4j"
     }
 }

wedpr-components/crypto/build.gradle

@@ -3,6 +3,6 @@ plugins {
     id 'java'
 }
 dependencies{
-    compile project(":wedpr-common-utils")
-    compile ("org.bouncycastle:bcprov-jdk18on:${bcprovVersion}")
+    api project(":wedpr-common-utils")
+    api ("org.bouncycastle:bcprov-jdk18on:${bcprovVersion}")
 }

wedpr-components/dataset/build.gradle

@@ -11,14 +11,14 @@ ext {
 }
 
 dependencies {
-    compile project(":wedpr-components-token-auth")
-    compile project(":wedpr-components-crypto")
-    compile project(":wedpr-components-db-mapper-dataset")
-    compile project(":wedpr-components-storage")
-    compile project(":wedpr-components-authorization")
+    api project(":wedpr-components-token-auth")
+    api project(":wedpr-components-crypto")
+    api project(":wedpr-components-db-mapper-dataset")
+    api project(":wedpr-components-storage")
+    api project(":wedpr-components-authorization")
 
     // hive
-    compile("org.apache.hive:hive-jdbc:${hiveVersion}") {
+    api("org.apache.hive:hive-jdbc:${hiveVersion}") {
         exclude group: "org.apache.zookeeper", module: "zookeeper4"
         exclude group: "org.eclipse.jetty.aggregate", module: "jetty-all"
         exclude group: 'javax.servlet', module: 'servlet-api'
@@ -27,25 +27,25 @@ dependencies {
         exclude group: 'org.eclipse.jetty', module: 'jetty-runner'
         exclude group: 'org.apache.logging.log4j'
     }
-    compile "org.apache.hadoop:hadoop-distcp:${hadoopVersion}"
-    compile "org.apache.hadoop:hadoop-hdfs:${hadoopVersion}"
-    compile "org.apache.poi:poi:${poiVersion}"
-    compile "org.apache.poi:poi-excelant:${poiVersion}"
-    compile "com.opencsv:opencsv:${opencsvVersion}"
+    api "org.apache.hadoop:hadoop-distcp:${hadoopVersion}"
+    api "org.apache.hadoop:hadoop-hdfs:${hadoopVersion}"
+    api "org.apache.poi:poi:${poiVersion}"
+    api "org.apache.poi:poi-excelant:${poiVersion}"
+    api "com.opencsv:opencsv:${opencsvVersion}"
 
     // da meng
-    compile "com.dameng:DmJdbcDriver18:${dmVersion}"
+    api "com.dameng:DmJdbcDriver18:${dmVersion}"
 //    compile "com.dameng:DmDialect-for-hibernate5.0:${dmVersion}"
 //    compile 'org.hibernate:hibernate-core:5.3.20.Final'
 
     // gauss
-    compile "org.postgresql:postgresql:${postgresqlVersion}"
+    api "org.postgresql:postgresql:${postgresqlVersion}"
 
     // king
-    compile "cn.com.kingbase:kingbase8:${kingVersion}"
+    api "cn.com.kingbase:kingbase8:${kingVersion}"
 //    compile files('libs/hibernate-4.dialect.jar')
 
     // shen tong
-    compile files('libs/oscarJDBC8.jar')
+    api files('libs/oscarJDBC8.jar')
 //    compile files('libs/oscarHibernate54.jar')
 }

wedpr-components/dataset/src/main/java/com/webank/wedpr/components/dataset/service/DatasetServiceImpl.java

@@ -297,8 +297,7 @@ public void deleteDatasetList(UserInfo userInfo, List<String> datasetIdList)
 
         // sort and distinct
         List<String> newDatasetIdList =
-                datasetIdList
-                        .stream()
+                datasetIdList.stream()
                         .distinct()
                         .sorted(String::compareTo)
                         .collect(Collectors.toList());

wedpr-components/db-mapper/dataset/build.gradle

@@ -3,7 +3,7 @@ plugins {
     id 'java'
 }
 dependencies{
-    compile project(":wedpr-components-mybatis")
-    compile project(":wedpr-components-uuid")
-    compile project(":wedpr-components-token-auth")
+    api project(":wedpr-components-mybatis")
+    api project(":wedpr-components-uuid")
+    api project(":wedpr-components-token-auth")
 }

wedpr-components/db-mapper/service-publish/build.gradle

@@ -3,8 +3,8 @@ plugins {
     id 'java'
 }
 dependencies{
-    compile project(":wedpr-components-hook")
-    compile project(":wedpr-components-api-credential")
-    compile project(":wedpr-components-mybatis")
-    compile project(":wedpr-components-uuid")
+    api project(":wedpr-components-hook")
+    api project(":wedpr-components-api-credential")
+    api project(":wedpr-components-mybatis")
+    api project(":wedpr-components-uuid")
 }

wedpr-components/env-integration/jupyter/build.gradle

@@ -3,11 +3,11 @@ plugins {
     id 'java'
 }
 dependencies{
-    compile project(":wedpr-components-token-auth")
-    compile project(":wedpr-components-mybatis")
-    compile project(":wedpr-components-uuid")
-    compile project(":wedpr-components-sys-config")
-    compile project(":wedpr-components-http-client")
-    compile project(":wedpr-components-hook")
-    compile project(":wedpr-components-task-plugin-api")
+    api project(":wedpr-components-token-auth")
+    api project(":wedpr-components-mybatis")
+    api project(":wedpr-components-uuid")
+    api project(":wedpr-components-sys-config")
+    api project(":wedpr-components-http-client")
+    api project(":wedpr-components-hook")
+    api project(":wedpr-components-task-plugin-api")
 }

wedpr-components/hook/build.gradle

@@ -3,6 +3,6 @@ plugins {
     id 'java'
 }
 dependencies{
-    compile libraries.spring, libraries.spring_boot
-    compile project(":wedpr-common-utils")
+    api libraries.spring, libraries.spring_boot
+    api project(":wedpr-common-utils")
 }

wedpr-components/http-client/build.gradle

@@ -4,6 +4,6 @@ plugins {
 }
 
 dependencies {
-    compile ("org.apache.httpcomponents:httpclient:${httpClientVersion}")
-    compile project(":wedpr-common-utils")
+    api ("org.apache.httpcomponents:httpclient:${httpClientVersion}")
+    api project(":wedpr-common-utils")
 }

wedpr-components/initializer/build.gradle

@@ -4,6 +4,6 @@ plugins {
 }
 
 dependencies {
-    compile project(":wedpr-common-utils")
-    compile("org.springframework.boot:spring-boot-starter-web:${springBootVersion}")
+    api project(":wedpr-common-utils")
+    api("org.springframework.boot:spring-boot-starter-web:${springBootVersion}")
 }

wedpr-components/key-generator/build.gradle

@@ -4,5 +4,5 @@ plugins {
 }
 
 dependencies {
-    implementation project(":wedpr-components-blockchain")
+    api project(":wedpr-components-blockchain")
 }

wedpr-components/leader-election/build.gradle

@@ -4,6 +4,6 @@ plugins {
 }
 
 dependencies {
-    compile project(":wedpr-components-sys-config")
-    compile project(":wedpr-components-uuid")
+    api project(":wedpr-components-sys-config")
+    api project(":wedpr-components-uuid")
 }

wedpr-components/meta/agency/build.gradle

@@ -3,6 +3,6 @@ plugins {
     id 'java'
 }
 dependencies{
-    compile project(":wedpr-components-mybatis")
-    compile project(":wedpr-components-uuid")
+    api project(":wedpr-components-mybatis")
+    api project(":wedpr-components-uuid")
 }