Skip to content

Commit add4c2e

Browse files
committed
Updates to alarm logger service docker stuff
1 parent 8de7361 commit add4c2e

File tree

4 files changed

+26
-5
lines changed

4 files changed

+26
-5
lines changed

.github/workflows/alarm-logger-docker-image.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ name: Alarm Logger Docker Image CI
22

33
on:
44
push:
5-
branches: [ "CSSTUDIO-2989" ]
5+
branches: [ "master" ]
66
paths: services/alarm-logger/**
77
tags:
88
- '**'

services/alarm-logger/README.md

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -135,3 +135,18 @@ A full list of checks is documented [here](https://maven.apache.org/maven-releas
135135
`mvn -Darguments="-Dskip-executable-jar" -Pdocs,releases release:perform`
136136
Checkout the release tag, build, sign and push the build binaries to sonatype. The `docs` profile is needed in order
137137
to create required javadocs jars.
138+
139+
# Docker
140+
141+
The latest version of the service is available as a Docker image (ghcr.io/controlsystemstudio/phoebus/service-alarm-logger:master).
142+
Pushes to the master branch into this directory will trigger a new build of the image.
143+
144+
Docker compose file is provided. It requires the following environment variable to be set:
145+
146+
```KAFKA_HOST_IP_ADDRESS=1.2.3.4```
147+
```ELASTIC_HOST_IP_ADDRESS=1.2.3.4```
148+
```ALARM_TOPICS```: comma-separated list of alarm topics subscribed to by the service
149+
150+
This may be preferable compared to setting environment variables on command line, e.g.
151+
152+
```>export KAFKA_HOST_IP_ADDRESS=1.2.3.4```.
Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
services:
2+
alarmlogger:
3+
image: ghcr.io/controlsystemstudio/phoebus/service-alarm-logger:master
4+
ports:
5+
- "8080:8080"
6+
command: >
7+
/bin/bash -c "
8+
java -jar /alarmlogger/service-alarm-logger-*.jar -bootstrap.servers ${KAFKA_HOST_IP_ADDRESS}:9092 -es_host ${ELASTIC_HOST_IP_ADDRESS} -topics ${ALARM_TOPICS} -noshell"
9+
10+

services/save-and-restore/docker-compose-save-and-restore.yml

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,3 @@ services:
1414
extra_hosts:
1515
- "host.docker.internal:host-gateway"
1616

17-
volumes:
18-
saveandrestore-es-data:
19-
driver: local
20-

0 commit comments

Comments
 (0)