From 4464058f876a73e5dad49360cd9f8044489015d5 Mon Sep 17 00:00:00 2001 From: shiyindaxiaojie <1813986321@qq.com> Date: Fri, 8 Sep 2023 23:38:27 +0800 Subject: [PATCH] update dockerfile --- .github/workflows/maven-ci.yml | 13 +- sentinel-dashboard/pom.xml | 828 +++++++++++++++++---------------- 2 files changed, 430 insertions(+), 411 deletions(-) diff --git a/.github/workflows/maven-ci.yml b/.github/workflows/maven-ci.yml index 4385bfa451..ea8f0020ca 100644 --- a/.github/workflows/maven-ci.yml +++ b/.github/workflows/maven-ci.yml @@ -6,7 +6,7 @@ name: Maven CI on: push: branches: - - master + - main - 1.8.x paths-ignore: - '**.md' @@ -41,15 +41,18 @@ jobs: - name: Build with Maven run: | chmod +x mvnw - ./mvnw -ntp -pl sentinel-dashboard package -DskipTests -U -T 4C -s $GITHUB_WORKSPACE/settings.xml + ./mvnw -ntp -pl sentinel-dashboard package -DskipTests -T 4C -s $GITHUB_WORKSPACE/settings.xml env: GITHUB_TOKEN: ${{ github.token }} - name: Publish to Docker Hub run: | - echo "github$DOCKER_USERNAME$DOCKER_PASSWORD" > $GITHUB_WORKSPACE/settings.xml - chmod +x mvnw - ./mvnw -ntp -Pgithub -pl sentinel-dashboard jib:build -Dimage=shiyindaxiaojie/sentinel-dashboard -Djib.disableUpdateChecks=true -DskipTests -U -T 4C -s $GITHUB_WORKSPACE/settings.xml + docker login -u $DOCKER_USERNAME -p $DOCKER_PASSWORD + docker build -f docker/Dockerfile -t $DOCKER_IMAGE:$DOCKER_VERSION -t $DOCKER_IMAGE:latest . + docker push $DOCKER_IMAGE:$DOCKER_VERSION + docker push $DOCKER_IMAGE:latest env: DOCKER_USERNAME: ${{ secrets.DOCKER_USERNAME }} DOCKER_PASSWORD: ${{ secrets.DOCKER_PASSWORD }} + DOCKER_IMAGE: shiyindaxiaojie/sentinel-dashboard + DOCKER_VERSION: 1.8.6 diff --git a/sentinel-dashboard/pom.xml b/sentinel-dashboard/pom.xml index 64d09a7242..17d00b3423 100644 --- a/sentinel-dashboard/pom.xml +++ b/sentinel-dashboard/pom.xml @@ -1,92 +1,93 @@ - + - 4.0.0 - - com.alibaba.csp - sentinel-parent - 1.8.6 - + 4.0.0 + + com.alibaba.csp + sentinel-parent + 1.8.6 + - sentinel-dashboard - jar + sentinel-dashboard + jar - - @ - 2.5.12 - 5.3.18 + + @ + 2.5.12 + 5.3.18 2.14.2 - 1.18.20 - 1.4.1.Final + 1.18.20 + 1.4.1.Final - - 1.7.36 - 1.2.17 + + 1.7.36 + 1.2.17 - - 2.6 - 3.8.1 - 4.5.13 - 4.4.6 - 4.1.3 + + 2.6 + 3.8.1 + 4.5.13 + 4.4.6 + 4.1.3 - - 1.2.0 - 4.0.1 + + 1.2.0 + 4.0.1 - - 2.9.1 - 6.4.0 + + 2.9.1 + 6.4.0 - - com.alibaba.csp.sentinel.dashboard.SentinelApplication - 2.2.0 - - - + + com.alibaba.csp.sentinel.dashboard.SentinelApplication + 2.2.0 + + + - - 1.16.1 - + + 1.16.1 + - - - - spring-aop - org.springframework - ${spring.framework.version} - - - spring-beans - org.springframework - ${spring.framework.version} - - - spring-expression - org.springframework - ${spring.framework.version} - - - spring-core - org.springframework - ${spring.framework.version} - - - spring-context - org.springframework - ${spring.framework.version} - - - spring-tx - org.springframework - ${spring.framework.version} - + + + + spring-aop + org.springframework + ${spring.framework.version} + + + spring-beans + org.springframework + ${spring.framework.version} + + + spring-expression + org.springframework + ${spring.framework.version} + + + spring-core + org.springframework + ${spring.framework.version} + + + spring-context + org.springframework + ${spring.framework.version} + + + spring-tx + org.springframework + ${spring.framework.version} + - - org.slf4j - slf4j-api - ${slf4j-api.version} - + + org.slf4j + slf4j-api + ${slf4j-api.version} + com.fasterxml.jackson @@ -95,98 +96,98 @@ pom import - - + + - - - com.alibaba.csp - sentinel-core - - - com.alibaba.csp - sentinel-web-servlet - ${project.version} - - - com.alibaba.csp - sentinel-transport-simple-http - - - com.alibaba.csp - sentinel-parameter-flow-control - ${project.version} - - - com.alibaba.csp - sentinel-api-gateway-adapter-common - ${project.version} - + + + com.alibaba.csp + sentinel-core + + + com.alibaba.csp + sentinel-web-servlet + ${project.version} + + + com.alibaba.csp + sentinel-transport-simple-http + + + com.alibaba.csp + sentinel-parameter-flow-control + ${project.version} + + + com.alibaba.csp + sentinel-api-gateway-adapter-common + ${project.version} + - - org.springframework.boot - spring-boot-starter-actuator - ${spring.boot.version} + + org.springframework.boot + spring-boot-starter-actuator + ${spring.boot.version} + + + org.springframework.boot + spring-boot-starter-web + ${spring.boot.version} + + + org.springframework.boot + spring-boot-starter-logging + ${spring.boot.version} + + + org.springframework.boot + spring-boot-starter-test + ${spring.boot.version} + test + + + junit-jupiter-api + org.junit.jupiter + + - - org.springframework.boot - spring-boot-starter-web - ${spring.boot.version} - - - org.springframework.boot - spring-boot-starter-logging - ${spring.boot.version} - - - org.springframework.boot - spring-boot-starter-test - ${spring.boot.version} - test - - - junit-jupiter-api - org.junit.jupiter - - - - - - log4j - log4j - ${log4j.version} - + + + log4j + log4j + ${log4j.version} + - - - org.projectlombok - lombok - ${lombok.version} - - - org.mapstruct - mapstruct - ${mapstruct.version} - - - com.alibaba - fastjson - - - commons-lang - commons-lang - ${commons-lang.version} - - - org.apache.commons - commons-lang3 - ${commons-lang3.version} - - - org.apache.httpcomponents - httpclient - ${httpclient.version} + + + org.projectlombok + lombok + ${lombok.version} + + + org.mapstruct + mapstruct + ${mapstruct.version} + + + com.alibaba + fastjson + + + commons-lang + commons-lang + ${commons-lang.version} + + + org.apache.commons + commons-lang3 + ${commons-lang3.version} + + + org.apache.httpcomponents + httpclient + ${httpclient.version} httpcore @@ -194,20 +195,20 @@ - - org.apache.httpcomponents - httpcore - ${httpcore.version} - - - org.apache.httpcomponents - httpcore-nio - ${httpcore.version} - - - org.apache.httpcomponents - httpasyncclient - ${httpasyncclient.version} + + org.apache.httpcomponents + httpcore + ${httpcore.version} + + + org.apache.httpcomponents + httpcore-nio + ${httpcore.version} + + + org.apache.httpcomponents + httpasyncclient + ${httpasyncclient.version} httpclient @@ -216,133 +217,133 @@ - - - com.alibaba.csp - sentinel-datasource-nacos - - - snakeyaml - org.yaml - - - jackson-databind - com.fasterxml.jackson.core - - - jackson-core - com.fasterxml.jackson.core - - - httpasyncclient - org.apache.httpcomponents - - - + + + com.alibaba.csp + sentinel-datasource-nacos + + + snakeyaml + org.yaml + + + jackson-databind + com.fasterxml.jackson.core + + + jackson-core + com.fasterxml.jackson.core + + + httpasyncclient + org.apache.httpcomponents + + + - - - com.ctrip.framework.apollo - apollo-openapi - ${apollo.version} - - - guava - com.google.guava - - - commons-codec - commons-codec - - - httpclient - org.apache.httpcomponents - - - httpcore - org.apache.httpcomponents - - - gson - com.google.code.gson - - - + + + com.ctrip.framework.apollo + apollo-openapi + ${apollo.version} + + + guava + com.google.guava + + + commons-codec + commons-codec + + + httpclient + org.apache.httpcomponents + + + httpcore + org.apache.httpcomponents + + + gson + com.google.code.gson + + + - - - org.apache.curator - curator-recipes - ${curator.version} - - - guava - com.google.guava - - - + + + org.apache.curator + curator-recipes + ${curator.version} + + + guava + com.google.guava + + + - - - com.influxdb - influxdb-client-java - ${influxdb.version} - - - com.influxdb - influxdb-client-flux - ${influxdb.version} - - - com.influxdb - flux-dsl - ${influxdb.version} - - - com.influxdb - influxdb-spring - ${influxdb.version} - - - micrometer-registry-influx - io.micrometer - - - + + + com.influxdb + influxdb-client-java + ${influxdb.version} + + + com.influxdb + influxdb-client-flux + ${influxdb.version} + + + com.influxdb + flux-dsl + ${influxdb.version} + + + com.influxdb + influxdb-spring + ${influxdb.version} + + + micrometer-registry-influx + io.micrometer + + + - - - org.springframework.kafka - spring-kafka - ${spring-kafka.version} - + + + org.springframework.kafka + spring-kafka + ${spring-kafka.version} + - - - org.springframework.boot - spring-boot-starter-data-elasticsearch - ${spring.boot.version} - - - snakeyaml - org.yaml - - - log4j-api - org.apache.logging.log4j - - - jackson-core - com.fasterxml.jackson.core - - - HdrHistogram - org.hdrhistogram - - - jackson-databind - com.fasterxml.jackson.core - + + + org.springframework.boot + spring-boot-starter-data-elasticsearch + ${spring.boot.version} + + + snakeyaml + org.yaml + + + log4j-api + org.apache.logging.log4j + + + jackson-core + com.fasterxml.jackson.core + + + HdrHistogram + org.hdrhistogram + + + jackson-databind + com.fasterxml.jackson.core + httpasyncclient org.apache.httpcomponents @@ -360,108 +361,123 @@ org.apache.httpcomponents - + - - - junit - junit - test - - - org.mockito - mockito-core - test - - - com.github.stefanbirkner - system-rules - ${system-rules.version} - test - - + + + junit + junit + test + + + org.mockito + mockito-core + test + + + com.github.stefanbirkner + system-rules + ${system-rules.version} + test + + - - sentinel-dashboard - - - - org.apache.maven.plugins - maven-resources-plugin - - - ${resource.delimiter} - - false - - - - org.apache.maven.plugins - maven-compiler-plugin - - - - org.projectlombok - lombok - ${lombok.version} - - - org.mapstruct - mapstruct-processor - ${mapstruct.version} - - - org.springframework.boot - spring-boot-configuration-processor - ${spring.boot.version} - - - ${java.version} - ${java.version} - ${project.build.sourceEncoding} - false - - -Xlint - - - - - - + + sentinel-dashboard + + + + org.apache.maven.plugins + maven-resources-plugin + + + ${resource.delimiter} + + false + + + + org.apache.maven.plugins + maven-compiler-plugin + + + + org.projectlombok + lombok + ${lombok.version} + + + org.mapstruct + mapstruct-processor + ${mapstruct.version} + + + org.springframework.boot + spring-boot-configuration-processor + ${spring.boot.version} + + + ${java.version} + ${java.version} + ${project.build.sourceEncoding} + false + + -Xlint + + + + + org.springframework.boot + spring-boot-maven-plugin + ${spring.boot.version} + + ${start-class} + + true + true + + ${project.basedir}/src/main/docker/layers.xml + + + + + + spring-boot-build-info + compile + + build-info + + + + spring-boot-repackage + package + + repackage + + + + + + + + + org.apache.maven.plugins + maven-compiler-plugin + org.springframework.boot spring-boot-maven-plugin - ${spring.boot.version} + + + + org.apache.maven.plugins + maven-deploy-plugin + ${maven.deploy.version} - ${start-class} - - true - true - - ${project.basedir}/src/main/docker/layers.xml - - + true - - - spring-boot-build-info - compile - - build-info - - - - - org.apache.maven.plugins - maven-deploy-plugin - ${maven.deploy.version} - - true - - - com.google.cloud.tools @@ -511,20 +527,20 @@ true - + - - - src/main/resources - true - + + + src/main/resources + true + - - src/main/webapp/ - - resources/node_modules/** - - - - + + src/main/webapp/ + + resources/node_modules/** + + + +