Merge branch '3.5-dev' into 3.6-dev

apache · Jul 13, 2022 · 608279d · 608279d
2 parents 18ca740 + 8c1f0ea
commit 608279d
Show file tree

Hide file tree

Showing 2 changed files with 40 additions and 2 deletions.
diff --git a/.github/workflows/build-test.yml b/.github/workflows/build-test.yml
@@ -236,8 +236,7 @@ jobs:
       - name: Generate Gremlin Server Base Image
         working-directory: .
         run: |
-          mvn clean install -DskipTests -DskipIntegrationTests=true -am
-          mvn install -Pdocker-images -pl :gremlin-server -DskipTests
+          mvn clean install -pl gremlin-server -DskipTests -DskipIntegrationTests=true -Dci -am
       - name: Build with Maven
         working-directory: .
         run: |

diff --git a/gremlin-server/pom.xml b/gremlin-server/pom.xml
@@ -150,7 +150,46 @@ limitations under the License.
             </plugin>
         </plugins>
     </build>
+
     <profiles>
+        <profile>
+            <!-- only build docker image for linux - this fails on windoze. gremlin server image will be generated
+                 on each build as language variants will need the latest to do their work. windows users will need
+                 to manually generate somehow until this is solved -->
+            <id>linux</id>
+            <activation>
+                <activeByDefault>false</activeByDefault>
+                <os>
+                    <family>unix</family>
+                </os>
+            </activation>
+            <build>
+                <plugins>
+                    <plugin>
+                        <groupId>com.spotify</groupId>
+                        <artifactId>dockerfile-maven-plugin</artifactId>
+                        <executions>
+                            <execution>
+                                <id>docker-image-build</id>
+                                <goals>
+                                    <goal>build</goal>
+                                </goals>
+                                <configuration>
+                                    <tag>${project.version}</tag>
+                                    <buildArgs>
+                                        <GREMLIN_SERVER_DIR>target/apache-tinkerpop-${project.artifactId}-${project.version}-standalone</GREMLIN_SERVER_DIR>
+                                    </buildArgs>
+                                </configuration>
+                            </execution>
+                        </executions>
+                        <configuration>
+                            <repository>tinkerpop/gremlin-server</repository>
+                        </configuration>
+                    </plugin>
+                </plugins>
+            </build>
+        </profile>
+
         <profile>
             <id>use-epoll</id>
             <activation>