Skip to content

spline #1166 docker build on m1 support #1169

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
wajda merged 1 commit into from
Feb 14, 2023
Merged

spline #1166 docker build on m1 support #1169

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 1 addition & 3 deletions admin/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,9 +17,7 @@
# Run image using:
# $> docker run --rm -it absaoss/spline-admin:latest

ARG DOCKER_BASE_IMAGE_PREFIX

FROM "$DOCKER_BASE_IMAGE_PREFIX"adoptopenjdk:11-jre
FROM adoptopenjdk:11-jre

ARG PROJECT_BUILD_FINAL_NAME
ARG IMAGE_NAME
Expand Down
7 changes: 2 additions & 5 deletions admin/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -139,13 +139,10 @@
</executions>
</plugin>
<plugin>
<groupId>com.spotify</groupId>
<artifactId>dockerfile-maven-plugin</artifactId>
<groupId>io.fabric8</groupId>
<artifactId>docker-maven-plugin</artifactId>
<configuration>
<skip>false</skip>
<buildArgs>
<IMAGE_NAME>${dockerfile.imageName}</IMAGE_NAME>
</buildArgs>
</configuration>
</plugin>
</plugins>
Expand Down
2 changes: 1 addition & 1 deletion build/parent-pom/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
<parent>
<groupId>za.co.absa</groupId>
<artifactId>root-pom</artifactId>
<version>1.0.4</version>
<version>1.0.5</version>
</parent>

<groupId>za.co.absa.spline</groupId>
Expand Down
4 changes: 1 addition & 3 deletions kafka-gateway/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,7 @@
# limitations under the License.
#

ARG DOCKER_BASE_IMAGE_PREFIX=

FROM "$DOCKER_BASE_IMAGE_PREFIX"tomcat:9-jre11-openjdk-slim-buster
FROM tomcat:9-jre11-openjdk-slim-buster

LABEL \
vendor="ABSA" \
Expand Down
4 changes: 2 additions & 2 deletions kafka-gateway/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -111,8 +111,8 @@
</configuration>
</plugin>
<plugin>
<groupId>com.spotify</groupId>
<artifactId>dockerfile-maven-plugin</artifactId>
<groupId>io.fabric8</groupId>
<artifactId>docker-maven-plugin</artifactId>
<configuration>
<skip>false</skip>
</configuration>
Expand Down
4 changes: 1 addition & 3 deletions rest-gateway/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,7 @@
# limitations under the License.
#

ARG DOCKER_BASE_IMAGE_PREFIX=

FROM "$DOCKER_BASE_IMAGE_PREFIX"tomcat:9-jre11-openjdk-slim-buster
FROM tomcat:9-jre11-openjdk-slim-buster

LABEL \
vendor="ABSA" \
Expand Down
4 changes: 2 additions & 2 deletions rest-gateway/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -202,8 +202,8 @@
</configuration>
</plugin>
<plugin>
<groupId>com.spotify</groupId>
<artifactId>dockerfile-maven-plugin</artifactId>
<groupId>io.fabric8</groupId>
<artifactId>docker-maven-plugin</artifactId>
<configuration>
<skip>false</skip>
</configuration>
Expand Down