Skip to content

Commit

Permalink
Merge pull request #248 from devatherock/multi-arch
Browse files Browse the repository at this point in the history
feat: Built a multi-arch docker image
  • Loading branch information
devatherock authored Jun 2, 2023
2 parents 931fb3c + cf40124 commit 8522c2d
Show file tree
Hide file tree
Showing 4 changed files with 14 additions and 10 deletions.
17 changes: 11 additions & 6 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -140,9 +140,13 @@ jobs:
- run: |
TAG=${CIRCLE_SHA1:0:8}
docker login -u $DOCKER_USERNAME -p $DOCKER_PASSWORD
docker build -t devatherock/artifactory-badge:$TAG -t devatherock/artifactory-badge:latest .
docker push devatherock/artifactory-badge:$TAG
docker push devatherock/artifactory-badge:latest
docker buildx create --name rockbuilder \
--driver docker-container --use --bootstrap
docker buildx build \
--platform linux/amd64,linux/arm64 \
--push \
-t devatherock/artifactory-badge:$TAG \
-t devatherock/artifactory-badge:latest .
dockerhub_readme:
machine:
Expand All @@ -169,9 +173,10 @@ jobs:
TAG=${CIRCLE_TAG#v}
DEV_TAG=${CIRCLE_SHA1:0:8}
docker login -u $DOCKER_USERNAME -p $DOCKER_PASSWORD
docker pull devatherock/artifactory-badge:$DEV_TAG
docker tag devatherock/artifactory-badge:$DEV_TAG devatherock/artifactory-badge:$TAG
docker push devatherock/artifactory-badge:$TAG
docker buildx create --name rockbuilder \
--driver docker-container --use --bootstrap
docker buildx imagetools create \
-t devatherock/artifactory-badge:$TAG devatherock/artifactory-badge:$DEV_TAG
notify:
<<: *slack_image
Expand Down
3 changes: 1 addition & 2 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -12,11 +12,9 @@
- fix(deps): update dependency org.codehaus.janino:janino to v3.1.9
- fix(deps): update dependency com.fasterxml.jackson.core:jackson-databind to v2.14.1
- chore(deps): update plugin com.github.kt3k.coveralls to v2.12.2
- fix(deps): update dependency org.projectlombok:lombok to v1.18.26
- chore(deps): update docker orb to v2.2.0
- chore(deps): update plugin org.owasp.dependencycheck to v8.2.1
- fix(deps): update dependency net.logstash.logback:logstash-logback-encoder to v7.3
- chore(deps): update plugin org.sonarqube to v4
- fix(deps): update dependency ch.qos.logback:logback-classic to v1.4.7
- fix(deps): update dependency org.jsoup:jsoup to v1.16.1
- Used custom `publish` step instead of docker orb, to fix the failing multi-stage build
Expand All @@ -28,6 +26,7 @@
- fix(deps): update dependency org.projectlombok:lombok to v1.18.28
- chore(deps): update plugin com.diffplug.spotless to v6.19.0
- chore(deps): update plugin org.sonarqube to v4.1.0.3113
- [#247](https://github.com/devatherock/artifactory-badge/issues/247): Built a multi-arch docker image

### Removed
- `Jansi` as it was preventing the app from running in local
Expand Down
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ RUN native-image -cp build/libs/*-all.jar
FROM gcr.io/distroless/base-debian11:latest

LABEL maintainer="devatherock@gmail.com"
LABEL io.github.devatherock.version="1.3.0"
LABEL io.github.devatherock.version="2.0.0"

EXPOSE 8080

Expand Down
2 changes: 1 addition & 1 deletion build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ plugins {
id 'org.owasp.dependencycheck' version '8.2.1'
}

version "1.3.0"
version "2.0.0"
group "io.github.devatherock"
sourceCompatibility = '11'
targetCompatibility = '11'
Expand Down

0 comments on commit 8522c2d

Please sign in to comment.