Skip to content

Commit d54a5c0

Browse files
author
Juraj Veverka
committed
versions upgraded
1 parent d0bb01a commit d54a5c0

File tree

3 files changed

+17
-17
lines changed

3 files changed

+17
-17
lines changed

device-controller/README.md

+8-8
Original file line numberDiff line numberDiff line change
@@ -123,18 +123,18 @@ docker-compose down -v --rmi all --remove-orphans
123123
## Build Dockers for x86_64 and ARM64
124124
```
125125
# on x86 AMD64 device:
126-
docker build -t jurajveverka/device-controller:1.4.12-amd64 --build-arg ARCH=amd64 --file ./device-controller/Dockerfile ./device-controller
127-
docker push jurajveverka/device-controller:1.4.12-amd64
126+
docker build -t jurajveverka/device-controller:1.4.20-amd64 --build-arg ARCH=amd64 --file ./device-controller/Dockerfile ./device-controller
127+
docker push jurajveverka/device-controller:1.4.20-amd64
128128
129129
# on ARM64 v8 device:
130-
docker build -t jurajveverka/device-controller:1.4.12-arm64v8 --build-arg ARCH=arm64v8 --file ./device-controller/Dockerfile ./device-controller
131-
docker push jurajveverka/device-controller:1.4.12-arm64v8
130+
docker build -t jurajveverka/device-controller:1.4.20-arm64v8 --build-arg ARCH=arm64v8 --file ./device-controller/Dockerfile ./device-controller
131+
docker push jurajveverka/device-controller:1.4.20-arm64v8
132132
133133
# on x86 AMD64 device:
134134
docker manifest create \
135-
jurajveverka/device-controller:1.4.12 \
136-
--amend jurajveverka/device-controller:1.4.12-amd64 \
137-
--amend jurajveverka/device-controller:1.4.12-arm64v8
135+
jurajveverka/device-controller:1.4.20 \
136+
--amend jurajveverka/device-controller:1.4.20-amd64 \
137+
--amend jurajveverka/device-controller:1.4.20-arm64v8
138138
139-
docker manifest push jurajveverka/device-controller:1.4.12
139+
docker manifest push jurajveverka/device-controller:1.4.20
140140
```

device-controller/device-controller/build.gradle

+8-8
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
plugins {
2-
id 'org.springframework.boot' version '2.5.2'
2+
id 'org.springframework.boot' version '2.5.3'
33
id 'io.spring.dependency-management' version '1.0.11.RELEASE'
44
id 'java'
55
}
66

77
group = 'one.microproject.devicecontroller'
8-
version = '1.4.14-SNAPSHOT'
8+
version = '1.4.20-SNAPSHOT'
99
sourceCompatibility = '16'
1010
targetCompatibility = '16'
1111

@@ -22,15 +22,15 @@ dependencies {
2222
runtimeOnly 'io.micrometer:micrometer-registry-prometheus'
2323
implementation 'org.springdoc:springdoc-openapi-ui:1.5.9'
2424

25-
implementation 'one.microproject.rpi:rpi-device:1.1.1'
26-
implementation 'one.microproject.rpi:rpi-camera-client:1.6.1'
27-
implementation 'one.microproject.rpi:rpi-powercontroller-client:1.4.1'
25+
implementation 'one.microproject.rpi:rpi-device:1.1.2'
26+
implementation 'one.microproject.rpi:rpi-camera-client:1.6.2'
27+
implementation 'one.microproject.rpi:rpi-powercontroller-client:1.4.2'
2828

2929
implementation 'org.bouncycastle:bcpg-jdk15on:1.69'
3030
implementation 'org.bouncycastle:bcpkix-jdk15on:1.69'
31-
implementation 'one.microproject.iamservice:iam-model:2.5.7-RELEASE'
32-
implementation 'one.microproject.iamservice:iam-client:2.5.7-RELEASE'
33-
implementation 'one.microproject.iamservice:iam-core:2.5.7-RELEASE'
31+
implementation 'one.microproject.iamservice:iam-model:2.5.8-RELEASE'
32+
implementation 'one.microproject.iamservice:iam-client:2.5.8-RELEASE'
33+
implementation 'one.microproject.iamservice:iam-core:2.5.8-RELEASE'
3434
implementation 'com.squareup.okhttp3:okhttp:4.9.1'
3535
implementation 'io.jsonwebtoken:jjwt-api:0.11.2'
3636

device-controller/device-controller/src/main/java/one/microproject/devicecontroller/controller/SystemInfoController.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ ResponseEntity<SystemInfo<DCInfo>> getSystemInfo() {
3232
Long uptime = timestamp - started;
3333
String timeZone = TimeZone.getDefault().getID();
3434
DCInfo dcInfo = new DCInfo(instanceId);
35-
return ResponseEntity.ok(new SystemInfo<>(appConfig.getId(), "device-controller", "1.4.12", "Device Controller [" + timeZone + "]", timestamp, uptime, dcInfo));
35+
return ResponseEntity.ok(new SystemInfo<>(appConfig.getId(), "device-controller", "1.4.20", "Device Controller [" + timeZone + "]", timestamp, uptime, dcInfo));
3636
}
3737

3838
}

0 commit comments

Comments
 (0)