Skip to content

Commit ffc5b46

Browse files
authored
fabric8 multi-platform test (#1015)
* test multi platform build with fabric8/docker-maven-plugin * fix trailing ws
1 parent ea4a2cb commit ffc5b46

File tree

2 files changed

+12
-11
lines changed

2 files changed

+12
-11
lines changed

package/pom.xml

Lines changed: 11 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -142,9 +142,8 @@
142142
<build>
143143
<plugins>
144144
<plugin>
145-
<groupId>org.eclipse.jkube</groupId>
146-
<artifactId>kubernetes-maven-plugin</artifactId>
147-
<version>${kubernetes-maven-plugin.version}</version>
145+
<groupId>io.fabric8</groupId>
146+
<artifactId>docker-maven-plugin</artifactId>
148147
<executions>
149148
<execution>
150149
<id>default</id>
@@ -162,22 +161,24 @@
162161
</execution>
163162
</executions>
164163
<configuration>
165-
<verbose>true</verbose>
166164
<images>
167165
<image>
168166
<name>arcadedata/arcadedb</name>
169167
<build>
170-
<dockerFile>${project.basedir}/src/main/docker/Dockerfile</dockerFile>
171-
<contextDir>${project.build.directory}/arcadedb-${project.version}.dir</contextDir>
172-
<args>
173-
<docker.buildArg.ARCH>arm64v8/,amd64/,winamd64/,arm32v7/</docker.buildArg.ARCH>
174-
</args>
168+
<contextDir>${project.basedir}</contextDir>
169+
<dockerFile>src/main/docker/Dockerfile</dockerFile>
170+
<buildx>
171+
<platforms>
172+
<platform>linux/amd64</platform>
173+
<platform>linux/arm64</platform>
174+
</platforms>
175+
</buildx>
175176
<tags>
176177
<tag>latest</tag>
177178
<tag>${project.version}</tag>
178179
</tags>
179180
</build>
180-
</image>
181+
</image>
181182
</images>
182183
</configuration>
183184
</plugin>

package/src/main/docker/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ WORKDIR /home/arcadedb
3434

3535
USER arcadedb
3636

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

3939
RUN chmod +x ./bin/*.sh
4040

0 commit comments

Comments
 (0)