fix: build.sh and jib (#26)

* test: ignore apollo * feat: support jib * feat: support dockerfile-maven-plugin * chore: .gitignore add .idea/ * test: jib * feat: support more jdk of docker from * test: 3 ways of docker image build * chore: update README.md * test: adjust suit of skywalking to below docker * chore: test * fix: optimization * refactor: adjust docker * test: adjust of docker * refactor: adjust scripts and pom for docker * fix: invalid expected token * refactor: adjust scripts and pom for docker * refactor: remove repoName and imageName * test: build.sh * test: docker of start-code.sh * chore: update quickly_start.md * feat: support remote debug * test: remoteDebug * fix: docker.tag * test: docker.tag * fix: error startup cmd for jib * refactor: extract docker repsitory as pom properties * fix: error reference for docker.repostiry * refactor: adjust build.sh * test: remove redundancy test * refactor: adjust start-code.sh * fix: under docker maven * test: start-code.sh * chore: remove redundancy ; * Update quickly_start.tmpl.md * fix: devops compatible * fix: build and run image by jib Co-authored-by: xieyuanqing <xieyuanqing@deepexi.com> Co-authored-by: taccisum <liaojinfeng@deepexi.com> Co-authored-by: taccisum <514162920@qq.com>
deepexi · Aug 6, 2020 · fa9c0f7 · fa9c0f7
1 parent 948857e
commit fa9c0f7
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 6 deletions.
diff --git a/generators/app/templates/${artifactId}-provider/pom.tmpl_provider_pom.xml b/generators/app/templates/${artifactId}-provider/pom.tmpl_provider_pom.xml
@@ -127,7 +127,7 @@
                 <plugin>
                 <groupId>com.google.cloud.tools</groupId>
                 <artifactId>jib-maven-plugin</artifactId>
-                <version>2.0.0</version>
+                <version>2.3.0</version>
                 <configuration>
                     <from>
                         <image>${jdk}</image>
@@ -139,14 +139,14 @@
                         <appRoot>/home</appRoot>
                         <workingDirectory>/home</workingDirectory>
                         <entrypoint>
-                            <arg>/bin/sh</arg>
-                            <arg>-c</arg>
                             <arg>/entrypoint.sh</arg>
                         </entrypoint>
                         <creationTime>USE_CURRENT_TIMESTAMP</creationTime>
                     </container>
                     <extraDirectories>
-                        <paths>scripts</paths>
+                        <paths>
+                            <path>scripts</path>
+                        </paths>
                         <permissions>
                             <permission>
                                 <file>/entrypoint.sh</file>

diff --git a/generators/app/templates/${artifactId}-provider/scripts/if_dockerScripts.entrypoint.tmpl.sh b/generators/app/templates/${artifactId}-provider/scripts/if_dockerScripts.entrypoint.tmpl.sh
@@ -29,7 +29,7 @@ cmd=\$\{cmd\}\'`
 
 if(docker === 'Jib') {
 tmpl += `
-            -cp resources/:classes/:libs/*
+            -cp /home/resources/:/home/classes/:/home/libs/*
                 ${basePackage}.StartupApplication $@
 \'`
 } else {

diff --git a/generators/app/templates/if_Dockerfile.build.tmpl.sh b/generators/app/templates/if_Dockerfile.build.tmpl.sh
@@ -30,5 +30,5 @@ h2 '准备构建Docker镜像'
 if [ ! -z $IMAGE_NAME ];then
     docker build --rm -t $IMAGE_NAME .
 else
-    docker build --rm -t $APP_NAME:$VERSION .
+    docker build --rm -t $APP_NAME:v$VERSION .
 fi