Skip to content

Commit

Permalink
Merge pull request #32 from cyface-de/release-2.1.6_DAT-1195
Browse files Browse the repository at this point in the history
Release 2.1.6 dat 1195
  • Loading branch information
hb0 authored May 21, 2022
2 parents 90126c7 + 384f321 commit ba9a830
Show file tree
Hide file tree
Showing 3 changed files with 9 additions and 3 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/publish-docker.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
# version: 1.0.2
# since: 1.0.0
#
# Version: 2.1.5
# Version: 2.1.6
name: (Test) Publish docker images

on:
Expand All @@ -25,7 +25,7 @@ on:

# Specify JARs version here.
env:
JARS_VERSION: '6.8.0'
JARS_VERSION: '6.8.1'

jobs:
publish:
Expand Down
2 changes: 1 addition & 1 deletion collector/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ RUN chown user:user entrypoint.sh collector-all.jar file-uploads
EXPOSE 8080

# Install tooling required to check for running Mongo Database in entrypoint.sh
RUN apt-get update && apt-get install -y \
RUN apt update && apt install -y \
netcat-openbsd

# Run app by non-privileged user.
Expand Down
6 changes: 6 additions & 0 deletions collector/entrypoint.sh
Original file line number Diff line number Diff line change
Expand Up @@ -110,10 +110,16 @@ loadCollectorParameters() {
echo "Enabling metrics reporting by API: $METRICS_ENABLED."
}

# Injects the database parameters for V3 and V2 databases
loadConfig() {
CONFIG="{\
\"jwt.private\":\"$JWT_PRIVATE_KEY_FILE_PATH\",\
\"jwt.public\":\"$JWT_PUBLIC_KEY_FILE_PATH\",\
\"mongo.db\":{\
\"db_name\":\"cyface\",\
\"connection_string\":\"mongodb://mongo:27017\",\
\"data_source_name\":\"cyface\"\
},\
\"mongo.userdb\":{\
\"db_name\":\"cyface\",\
\"connection_string\":\"mongodb://mongo:27017\",\
Expand Down

0 comments on commit ba9a830

Please sign in to comment.