Skip to content

Commit

Permalink
update reqs
Browse files Browse the repository at this point in the history
  • Loading branch information
wh1te909 committed Mar 15, 2024
1 parent 94f33bd commit 729bef9
Show file tree
Hide file tree
Showing 8 changed files with 15 additions and 15 deletions.
6 changes: 3 additions & 3 deletions api/tacticalrmm/requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ hiredis==2.3.2
meshctrl==0.1.15
msgpack==1.0.8
nats-py==2.7.2
packaging==23.2
packaging==24.0
psutil==5.9.8
psycopg[binary]==3.1.18
pycparser==2.21
Expand All @@ -25,7 +25,7 @@ pyotp==2.9.0
pyparsing==3.1.2
python-ipware==2.0.2
qrcode==7.4.2
redis==5.0.2
redis==5.0.3
requests==2.31.0
six==1.16.0
sqlparse==0.4.4
Expand All @@ -36,7 +36,7 @@ uWSGI==2.0.24
validators==0.22.0
vine==5.1.0
websockets==12.0
zipp==3.17.0
zipp==3.18.1
pandas==2.2.1
kaleido==0.2.1
jinja2==3.1.3
Expand Down
12 changes: 6 additions & 6 deletions api/tacticalrmm/tacticalrmm/settings.py
Original file line number Diff line number Diff line change
Expand Up @@ -31,19 +31,19 @@
APP_VER = "0.0.190"

# https://github.com/amidaware/rmmagent
LATEST_AGENT_VER = "2.6.2"
LATEST_AGENT_VER = "2.6.3"

MESH_VER = "1.1.21"

NATS_SERVER_VER = "2.10.11"
NATS_SERVER_VER = "2.10.12"

# Install Nushell on the agent
# https://github.com/nushell/nushell
INSTALL_NUSHELL = True
# GitHub version to download. The file will be downloaded from GitHub, extracted and installed.
# Version to download. If INSTALL_NUSHELL_URL is not provided, the file will be downloaded from GitHub,
# extracted and installed.
INSTALL_NUSHELL_VERSION = "0.90.1"
INSTALL_NUSHELL_VERSION = "0.91.0"
# URL to download directly. This is expected to be the direct URL, unauthenticated, uncompressed, ready to be installed.
# Use {OS}, {ARCH} and {VERSION} to specify the GOOS, GOARCH and INSTALL_NUSHELL_VERSION respectively.
# Windows: The ".exe" extension will be added automatically.
Expand All @@ -64,7 +64,7 @@
INSTALL_DENO = True
# Version to download. If INSTALL_DENO_URL is not provided, the file will be downloaded from GitHub,
# extracted and installed.
INSTALL_DENO_VERSION = "v1.41.0"
INSTALL_DENO_VERSION = "v1.41.2"
# URL to download directly. This is expected to be the direct URL, unauthenticated, uncompressed, ready to be installed.
# Use {OS}, {ARCH} and {VERSION} to specify the GOOS, GOARCH and INSTALL_DENO_VERSION respectively.
# Windows: The ".exe" extension will be added automatically.
Expand All @@ -83,8 +83,8 @@
# for the update script, bump when need to recreate venv
PIP_VER = "43"

SETUPTOOLS_VER = "69.1.1"
WHEEL_VER = "0.42.0"
SETUPTOOLS_VER = "69.2.0"
WHEEL_VER = "0.43.0"

AGENT_BASE_URL = "https://agents.tacticalrmm.com"

Expand Down
2 changes: 1 addition & 1 deletion docker/containers/tactical-nats/dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM nats:2.10.11-alpine
FROM nats:2.10.12-alpine

ENV TACTICAL_DIR /opt/tactical
ENV TACTICAL_READY_FILE ${TACTICAL_DIR}/tmp/tactical.ready
Expand Down
4 changes: 2 additions & 2 deletions go.mod
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
module github.com/amidaware/tacticalrmm

go 1.21.6
go 1.21.8

require (
github.com/jmoiron/sqlx v1.3.5
github.com/lib/pq v1.10.9
github.com/nats-io/nats.go v1.32.0
github.com/nats-io/nats.go v1.33.1
github.com/ugorji/go/codec v1.2.12
github.com/wh1te909/trmm-shared v0.0.0-20220227075846-f9f757361139
)
Expand Down
4 changes: 2 additions & 2 deletions go.sum
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@ github.com/lib/pq v1.10.9 h1:YXG7RB+JIjhP29X+OtkiDnYaXQwpS4JEWq7dtCCRUEw=
github.com/lib/pq v1.10.9/go.mod h1:AlVN5x4E4T544tWzH6hKfbfQvm3HdbOxrmggDNAPY9o=
github.com/mattn/go-sqlite3 v1.14.6 h1:dNPt6NO46WmLVt2DLNpwczCmdV5boIZ6g/tlDrlRUbg=
github.com/mattn/go-sqlite3 v1.14.6/go.mod h1:NyWgC/yNuGj7Q9rpYnZvas74GogHl5/Z4A/KQRfk6bU=
github.com/nats-io/nats.go v1.32.0 h1:Bx9BZS+aXYlxW08k8Gd3yR2s73pV5XSoAQUyp1Kwvp0=
github.com/nats-io/nats.go v1.32.0/go.mod h1:Ubdu4Nh9exXdSz0RVWRFBbRfrbSxOYd26oF0wkWclB8=
github.com/nats-io/nats.go v1.33.1 h1:8TxLZZ/seeEfR97qV0/Bl939tpDnt2Z2fK3HkPypj70=
github.com/nats-io/nats.go v1.33.1/go.mod h1:Ubdu4Nh9exXdSz0RVWRFBbRfrbSxOYd26oF0wkWclB8=
github.com/nats-io/nkeys v0.4.7 h1:RwNJbbIdYCoClSDNY7QVKZlyb/wfT6ugvFCiKy6vDvI=
github.com/nats-io/nkeys v0.4.7/go.mod h1:kqXRgRDPlGy7nGaEDMuYzmiJCIAAWDK0IMBtDmGD0nc=
github.com/nats-io/nuid v1.0.1 h1:5iA8DT8V7q8WK2EScv2padNa/rTESc1KdnPw4TC2paw=
Expand Down
2 changes: 1 addition & 1 deletion main.go
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ import (
)

var (
version = "3.5.2"
version = "3.5.3"
log = logrus.New()
)

Expand Down
Binary file modified natsapi/bin/nats-api
Binary file not shown.
Binary file modified natsapi/bin/nats-api-arm64
Binary file not shown.

0 comments on commit 729bef9

Please sign in to comment.