From 6640f1bdf013e8746d4d60e4b942bf9fdbece7af Mon Sep 17 00:00:00 2001 From: zhouhao Date: Mon, 13 Feb 2023 12:01:31 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/maven.yml | 6 +++--- jetlinks-standalone/Dockerfile | 3 +++ 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml index 6915efa9..be5c49ac 100644 --- a/.github/workflows/maven.yml +++ b/.github/workflows/maven.yml @@ -9,16 +9,16 @@ jobs: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v1 + - uses: actions/checkout@v2 - name: Set up JDK 1.8 uses: actions/setup-java@v1 with: java-version: 1.8 - name: Cache Maven Repository - uses: actions/cache@v1 + uses: actions/cache@v3 with: path: ~/.m2 - key: jetlinks-community-maven-repository + key: ${{ runner.os }}-${{ hashFiles('**/pom.xml') }} - name: Build with Maven run: ./mvnw clean install -Dmaven.build.timestamp="$(date "+%Y-%m-%d %H:%M:%S")" -Dmaven.test.skip=true -Pbuild && cd jetlinks-standalone && docker build -t registry.cn-shenzhen.aliyuncs.com/jetlinks/jetlinks-standalone:$(mvn help:evaluate -Dexpression=project.version -q -DforceStdout) . - name: Login Docker Repo diff --git a/jetlinks-standalone/Dockerfile b/jetlinks-standalone/Dockerfile index a925ffa1..1575f614 100644 --- a/jetlinks-standalone/Dockerfile +++ b/jetlinks-standalone/Dockerfile @@ -10,6 +10,9 @@ COPY --from=builder application/dependencies/ ./ COPY --from=builder application/snapshot-dependencies/ ./ COPY --from=builder application/spring-boot-loader/ ./ COPY --from=builder application/application/ ./ +RUN true COPY docker-entrypoint.sh ./ +RUN true RUN chmod +x docker-entrypoint.sh +RUN true ENTRYPOINT ["./docker-entrypoint.sh"] \ No newline at end of file