diff --git a/compile-docker/docker-compose.yaml b/compile-docker/docker-compose.yaml index d1fa5d46..6dc49d61 100644 --- a/compile-docker/docker-compose.yaml +++ b/compile-docker/docker-compose.yaml @@ -58,7 +58,7 @@ services: apk add --no-cache git && go env -w GO111MODULE=auto && cd /go/src/calculations/ && - go get ./... && + go mod tidy && go build && cp calculations /publish_bin/" volumes: @@ -72,7 +72,7 @@ services: apk add --no-cache git && go env -w GO111MODULE=auto && cd /go/src/i104m/ && - go get ./... && + go mod tidy && go build && cp i104m /publish_bin/" volumes: diff --git a/platform-linux/build.sh b/platform-linux/build.sh index a4584f9c..5b38c7c6 100755 --- a/platform-linux/build.sh +++ b/platform-linux/build.sh @@ -38,18 +38,18 @@ export GOBIN=~/json-scada/bin go env -w GO111MODULE=auto cd ../calculations -go get ./... +go go mod tidy go build cp calculations ../../bin/ # cd ../plc4x-client # go get "github.com/icza/bitio" -# go get ./... +# go mod tidy # go build # cp plc4x-client ../../bin/ cd ../i104m -go get ./... +go mod tidy go build cp i104m ../../bin/ diff --git a/platform-mac/build.sh b/platform-mac/build.sh index 02d8340d..37a4b8be 100755 --- a/platform-mac/build.sh +++ b/platform-mac/build.sh @@ -36,12 +36,12 @@ export GOBIN=~/json-scada/bin go env -w GO111MODULE=auto cd ../calculations -go get ./... +go mod tidy go build cp calculations ../../bin/ cd ../i104m -go get ./... +go mod tidy go build cp i104m ../../bin/ diff --git a/platform-windows/build.bat b/platform-windows/build.bat index e5903882..927357fc 100644 --- a/platform-windows/build.bat +++ b/platform-windows/build.bat @@ -59,18 +59,18 @@ dotnet publish --no-self-contained --runtime win-x64 -p:PublishReadyToRun=true - go env -w GO111MODULE=auto set GOBIN=c:\json-scada\bin cd %SRCPATH%\calculations -go get ./... +go mod tidy go build copy /Y calculations %BINPATH% rem cd %SRCPATH%\plc4x-client rem go get "github.com/icza/bitio" -rem go get ./... +rem go mod tidy rem go build rem copy /Y plc4x-client.exe %BINPATH% cd %SRCPATH%\i104m -go get ./... +go mod tidy go build copy /Y i104m.exe %BINPATH% diff --git a/platform-windows/buildupd.bat b/platform-windows/buildupd.bat index ea2df348..990e9834 100644 --- a/platform-windows/buildupd.bat +++ b/platform-windows/buildupd.bat @@ -59,18 +59,18 @@ dotnet publish --no-self-contained --runtime win-x64 -p:PublishReadyToRun=true - go env -w GO111MODULE=auto set GOBIN=c:\json-scada\bin cd %SRCPATH%\calculations -go get ./... +go mod tidy go build copy /Y calculations %BINPATH% rem cd %SRCPATH%\plc4x-client rem go get "github.com/icza/bitio" -rem go get ./... +rem go mod tidy rem go build rem copy /Y plc4x-client.exe %BINPATH% cd %SRCPATH%\i104m -go get ./... +go mod tidy go build copy /Y i104m.exe %BINPATH% diff --git a/platform-windows/create_services.bat b/platform-windows/create_services.bat index 272e97c4..9dcf7d90 100644 --- a/platform-windows/create_services.bat +++ b/platform-windows/create_services.bat @@ -13,7 +13,7 @@ nssm set JSON_SCADA_postgresql Start SERVICE_AUTO_START nssm install JSON_SCADA_grafana "C:\json-scada\platform-windows\grafana-runtime\bin\grafana-server.exe" nssm set JSON_SCADA_grafana AppDirectory "C:\json-scada\platform-windows\grafana-runtime\bin" -nssm set JSON_SCADA_grafana AppEnvironmentExtra GF_SERVER_DOMAIN="127.0.0.1" GF_SERVER_ROOT_URL="%(protocol)s://%(domain)s:80/grafana/" GF_SERVER_SERVE_FROM_SUB_PATH="true" GF_AUTH_PROXY_ENABLED="true" GF_AUTH_PROXY_ENABLE_LOGIN_TOKEN="true" GF_AUTH_DISABLE_SIGNOUT_MENU="true" GF_AUTH_PROXY_WHITELIST="127.0.0.1" GF_SECURITY_DISABLE_INITIAL_ADMIN_CREATION="true" GF_SERVER_HTTP_ADDR="127.0.0.1" GF_SERVER_ENFORCE_DOMAIN="true" GF_SERVER_ENABLE_GZIP="true" GF_ANALYTICS_REPORTING_ENABLED="false" GF_ANALYTICS_CHECK_FOR_UPDATES="false" +nssm set JSON_SCADA_grafana AppEnvironmentExtra GF_SERVER_DOMAIN="127.0.0.1" GF_SERVER_ROOT_URL="%(protocol)s://%(domain)s:80/grafana/" GF_SERVER_SERVE_FROM_SUB_PATH="true" GF_AUTH_PROXY_ENABLED="true" GF_AUTH_PROXY_ENABLE_LOGIN_TOKEN="true" GF_AUTH_DISABLE_SIGNOUT_MENU="true" GF_AUTH_PROXY_WHITELIST="127.0.0.1" GF_SECURITY_DISABLE_INITIAL_ADMIN_CREATION="true" GF_SERVER_HTTP_ADDR="127.0.0.1" GF_SERVER_ENFORCE_DOMAIN="true" GF_SERVER_ENABLE_GZIP="true" GF_ANALYTICS_REPORTING_ENABLED="false" GF_ANALYTICS_CHECK_FOR_UPDATES="false" GF_SECURITY_ALLOW_EMBEDDING="true" rem example of using postgresql to host grafana config (necessary for multiple web servers): rem nssm set JSON_SCADA_grafana AppEnvironmentExtra GF_DATABASE_TYPE="postgres" GF_DATABASE_HOST="127.0.0.1" GF_DATABASE_USER="postgres" GF_DATABASE_PASSWORD="pwd" REM nssm set JSON_SCADA_grafana AppStdout "C:\json-scada\log\grafana-stdout.log"