Skip to content

Commit

Permalink
Revert "test multi platform build with fabric8/docker-maven-plugin (#…
Browse files Browse the repository at this point in the history
…1009)" (#1014)

This reverts commit 57d82ff.
  • Loading branch information
lvca authored Apr 7, 2023
1 parent 57d82ff commit f2d01d1
Show file tree
Hide file tree
Showing 2 changed files with 11 additions and 12 deletions.
21 changes: 10 additions & 11 deletions package/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -142,8 +142,9 @@
<build>
<plugins>
<plugin>
<groupId>io.fabric8</groupId>
<artifactId>docker-maven-plugin</artifactId>
<groupId>org.eclipse.jkube</groupId>
<artifactId>kubernetes-maven-plugin</artifactId>
<version>${kubernetes-maven-plugin.version}</version>
<executions>
<execution>
<id>default</id>
Expand All @@ -161,24 +162,22 @@
</execution>
</executions>
<configuration>
<verbose>true</verbose>
<images>
<image>
<name>arcadedata/arcadedb</name>
<build>
<contextDir>${project.basedir}</contextDir>
<dockerFile>src/main/docker/Dockerfile</dockerFile>
<buildx>
<platforms>
<platform>linux/amd64</platform>
<platform>linux/arm64</platform>
</platforms>
</buildx>
<dockerFile>${project.basedir}/src/main/docker/Dockerfile</dockerFile>
<contextDir>${project.build.directory}/arcadedb-${project.version}.dir</contextDir>
<args>
<docker.buildArg.ARCH>arm64v8/,amd64/,winamd64/,arm32v7/</docker.buildArg.ARCH>
</args>
<tags>
<tag>latest</tag>
<tag>${project.version}</tag>
</tags>
</build>
</image>
</image>
</images>
</configuration>
</plugin>
Expand Down
2 changes: 1 addition & 1 deletion package/src/main/docker/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ WORKDIR /home/arcadedb

USER arcadedb

COPY --chown=arcadedb:arcadedb ./target/arcadedb-*.dir/* ./
COPY --chown=arcadedb:arcadedb ./maven/arcadedb-* ./

RUN chmod +x ./bin/*.sh

Expand Down

0 comments on commit f2d01d1

Please sign in to comment.