Skip to content

Commit 5342747

Browse files
Produce multi-platform docker image (#176)
1 parent 9abe3db commit 5342747

File tree

7 files changed

+19
-11
lines changed

7 files changed

+19
-11
lines changed

.github/workflows/build-dev-release.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ jobs:
99
build-target: 'Docker,Sonatype'
1010
devRelease: true
1111
createTag: true
12+
docker-multi-platform: true
1213
docker-username: ${{ github.actor }}
1314
secrets:
1415
docker-password: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/build-release.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ jobs:
99
build-target: 'Docker,Sonatype'
1010
devRelease: false
1111
createTag: true
12+
docker-multi-platform: true
1213
docker-username: ${{ github.actor }}
1314
secrets:
1415
docker-password: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/build-sanpshot.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@ jobs:
1313
uses: th2-net/.github/.github/workflows/compound-java-dev.yml@main
1414
with:
1515
build-target: 'Docker,Sonatype'
16+
docker-multi-platform: true
1617
docker-username: ${{ github.actor }}
1718
secrets:
1819
docker-password: ${{ secrets.GITHUB_TOKEN }}

Dockerfile

Lines changed: 3 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,4 @@
1-
FROM gradle:8.11.1-jdk21 AS build
2-
ARG release_version
3-
COPY ./ .
4-
RUN gradle --no-daemon clean build dockerPrepare -Prelease_version=${release_version}
5-
6-
FROM adoptopenjdk/openjdk11:alpine
1+
FROM amazoncorretto:11-alpine-jdk
72
WORKDIR /home
8-
COPY --from=build /home/gradle/build/docker .
9-
ENTRYPOINT ["/home/service/bin/service", "/home/service/etc/config.yml"]
3+
COPY ./build/docker .
4+
ENTRYPOINT ["/home/service/bin/service", "/home/service/etc/config.yml"]

README.md

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# Overview (5.11.0)
1+
# Overview (5.11.1)
22

33
Message store (mstore) is an important th2 component responsible for storing raw messages into Cradle. Please refer to [Cradle repository] (https://github.com/th2-net/cradleapi/blob/master/README.md) for more details. This component has a pin for listening messages via MQ.
44

@@ -119,6 +119,16 @@ Please see more details about this feature via [link](https://github.com/th2-net
119119
120120
# Release notes
121121
122+
## 5.11.1
123+
124+
+ Produce multi-platform docker image
125+
+ migrated to [amazoncorretto:11-alpine-jdk](https://hub.docker.com/layers/library/amazoncorretto/11-alpine-jdk) docker image as base
126+
+ Updated:
127+
+ th2 gradle plugin: `0.3.10` (bom: `4.14.2`)
128+
+ cradle api: `5.7.0-dev`
129+
+ common: `5.16.1-dev`
130+
+ common-utils: `2.4.0-dev`
131+
122132
## 5.11.0
123133
* Provided option to limit parallel queries for statistic persistence
124134
* Enabled [Cassandra driver metrics](https://docs.datastax.com/en/developer/java-driver/4.10/manual/core/metrics/index.html)

gradle.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
1-
release_version=5.11.0
1+
release_version=5.11.1
22
description='th2 mstore component'
33
vcs_url=https://github.com/th2-net/th2-mstore

gradle/libs.versions.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ th2-task-utils = { group = "com.exactpro.th2", name = "task-utils", version = "0
1010
cradle-core = { group = "com.exactpro.th2", name = "cradle-core", version.ref = "cradle" }
1111
cradle-cassandra = { group = "com.exactpro.th2", name = "cradle-cassandra", version.ref = "cradle" }
1212

13-
junit-jupiter = { group = "org.junit.jupiter", name = "junit-jupiter", version = "5.14.4" }
13+
junit-jupiter = { group = "org.junit.jupiter", name = "junit-jupiter", version = "5.14.1" }
1414
mockito-junit-jupiter = { group = "org.mockito", name = "mockito-junit-jupiter", version = "5.20.0" }
1515

1616
[plugins]

0 commit comments

Comments
 (0)