Skip to content

Commit

Permalink
Merge pull request #1370 from ElizabethMorves/master
Browse files Browse the repository at this point in the history
I didn't have docker start. I propose such changes
  • Loading branch information
doom369 authored Sep 18, 2020
2 parents 5ca37d9 + fbba93f commit e70e54c
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
4 changes: 2 additions & 2 deletions server/Docker/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ MAINTAINER Florian Mauduit <[email protected]>
###

## Server Port
ENV BLYNK_SERVER_VERSION 0.41.7
ENV BLYNK_SERVER_VERSION 0.41.13
ENV HARDWARE_MQTT_PORT 8440
ENV HTTP_PORT 8080
ENV HTTPS_PORT 9443
Expand Down Expand Up @@ -49,7 +49,7 @@ ENV TABLE_ROWS_POOL_SIZE 100
ENV PROFILE_SAVE_WORKER_PERIOD 60000
ENV STATS_PRINT_WORKER_PERIOD 60000
ENV WEB_REQUEST_MAX_SIZE 524288
ENV CSV_EXPORT_DATA_POINT_MAX 43200
ENV CSV_EXPORT_DATA_POINTS_MAX 43200
ENV HARD_SOCKET_IDLE_TIMEOUT 10
ENV ADMIN_ROOT_PATH /admin
ENV PRODUCT_NAME Blynk
Expand Down
2 changes: 1 addition & 1 deletion server/Docker/bin/run.sh
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,6 @@ restore.host=${RESTORE_HOST}
product.name=${PRODUCT_NAME}
admin.email=${ADMIN_EMAIL}
admin.pass=${ADMIN_PASS}
" >> /data/config.properties
" > /config/server.properties

java -jar /blynk/server.jar -dataFolder /data -serverConfig /config/server.properties

0 comments on commit e70e54c

Please sign in to comment.