diff --git a/.config/Dockerfile b/.config/Dockerfile index c55d9e1..2dc26fa 100644 --- a/.config/Dockerfile +++ b/.config/Dockerfile @@ -1,4 +1,4 @@ -ARG grafana_version=latest +ARG grafana_version=latest@sha256:703b4a3aff457041dcbd15bf36dbc8bb83cb513b72b0912056985712be4c01bd ARG grafana_image=grafana-enterprise FROM grafana/${grafana_image}:${grafana_version} diff --git a/devenv/zabbix50/bootstrap/Dockerfile b/devenv/zabbix50/bootstrap/Dockerfile index 21b536c..36fb11f 100644 --- a/devenv/zabbix50/bootstrap/Dockerfile +++ b/devenv/zabbix50/bootstrap/Dockerfile @@ -1,4 +1,4 @@ -FROM python:3 +FROM python:3@sha256:6d58c1a9444bc2664f0fa20c43a592fcdb2698eb9a9c32257516538a2746c19a ENV ZBX_API_URL=http://zabbix-web ENV ZBX_API_USER="Admin" diff --git a/devenv/zabbix50/docker-compose.yml b/devenv/zabbix50/docker-compose.yml index 2dca772..4fc5edd 100644 --- a/devenv/zabbix50/docker-compose.yml +++ b/devenv/zabbix50/docker-compose.yml @@ -1,6 +1,6 @@ services: ssl-cert: - image: alpine:latest + image: alpine:latest@sha256:865b95f46d98cf867a156fe4a135ad3fe50d2056aa3f25ed31662dff6da4eb62 command: | sh -c "if [ ! -f /certs/nginx.crt ] || [ ! -f /certs/nginx.key ]; then apk add --no-cache openssl && @@ -26,7 +26,7 @@ services: # Zabbix zabbix-server: - image: zabbix/zabbix-server-pgsql:alpine-5.0-latest + image: zabbix/zabbix-server-pgsql:alpine-5.0-latest@sha256:b88c636ec3298529358914aa7fd04d3f7ae3da0eab261b405cb2a9fcb4fa5eae ports: - '10051:10051' depends_on: @@ -39,7 +39,7 @@ services: POSTGRES_DB: zabbix zabbix-web: - image: zabbix/zabbix-web-nginx-pgsql:alpine-5.0-latest + image: zabbix/zabbix-web-nginx-pgsql:alpine-5.0-latest@sha256:90d9d85d42d46a4978091bd6deb405e6c8486fd53af5720a6f7a6135e6baaa4b ports: - '443:443' - '8188:8080' @@ -65,7 +65,7 @@ services: - ../nginx/.htpasswd:/etc/nginx/.htpasswd:ro database: - image: postgres:14 + image: postgres:14@sha256:5fd97d3efae5e17da18b5884532f07c411330253e0a864d8895f176ab4ab0f90 ports: - '15432:5432' environment: @@ -73,13 +73,13 @@ services: POSTGRES_PASSWORD: zabbix zabbix-agent: - image: zabbix/zabbix-agent:alpine-5.0-latest + image: zabbix/zabbix-agent:alpine-5.0-latest@sha256:c34ca68c3120b1918bceb394f2275f6aa67ddecce641a0033fdea5c84b89731d environment: ZBX_SERVER_HOST: zabbix-server ZBX_SERVER_PORT: 10051 zabbix-proxy: - image: zabbix/zabbix-proxy-sqlite3:alpine-5.0-latest + image: zabbix/zabbix-proxy-sqlite3:alpine-5.0-latest@sha256:a963b30b2e4352be890c93f599749d42a8e6a8e549629ccc6b30de437ecd4a5f environment: ZBX_PROXYMODE: 0 ZBX_HOSTNAME: zabbix-proxy @@ -87,7 +87,7 @@ services: ZBX_SERVER_PORT: 10051 zabbix-agent-proxy: - image: zabbix/zabbix-agent:alpine-5.0-latest + image: zabbix/zabbix-agent:alpine-5.0-latest@sha256:c34ca68c3120b1918bceb394f2275f6aa67ddecce641a0033fdea5c84b89731d environment: ZBX_SERVER_HOST: zabbix-proxy ZBX_SERVER_PORT: 10051 @@ -117,7 +117,7 @@ services: # backend redis_backend: - image: redis:alpine + image: redis:alpine@sha256:6cbef353e480a8a6e7f10ec545f13d7d3fa85a212cdcc5ffaf5a1c818b9d3798 zas_backend_01: build: ../zas-agent @@ -135,7 +135,7 @@ services: # frontend redis_frontend: - image: redis:alpine + image: redis:alpine@sha256:6cbef353e480a8a6e7f10ec545f13d7d3fa85a212cdcc5ffaf5a1c818b9d3798 zas_frontend_01: build: ../zas-agent diff --git a/devenv/zabbix60/bootstrap/Dockerfile b/devenv/zabbix60/bootstrap/Dockerfile index da6457f..affd90d 100644 --- a/devenv/zabbix60/bootstrap/Dockerfile +++ b/devenv/zabbix60/bootstrap/Dockerfile @@ -1,4 +1,4 @@ -FROM python:2.7 +FROM python:2.7@sha256:cfa62318c459b1fde9e0841c619906d15ada5910d625176e24bf692cf8a2601d ENV ZBX_API_URL=http://zabbix-web:8080 ENV ZBX_API_USER="Admin" diff --git a/devenv/zabbix60/docker-compose.yml b/devenv/zabbix60/docker-compose.yml index 07cf65d..26d0113 100644 --- a/devenv/zabbix60/docker-compose.yml +++ b/devenv/zabbix60/docker-compose.yml @@ -1,6 +1,6 @@ services: ssl-cert: - image: alpine:latest + image: alpine:latest@sha256:865b95f46d98cf867a156fe4a135ad3fe50d2056aa3f25ed31662dff6da4eb62 command: | sh -c "if [ ! -f /certs/nginx.crt ] || [ ! -f /certs/nginx.key ]; then apk add --no-cache openssl && @@ -26,7 +26,7 @@ services: # Zabbix zabbix-server: - image: zabbix/zabbix-server-pgsql:alpine-6.0-latest + image: zabbix/zabbix-server-pgsql:alpine-6.0-latest@sha256:dbc5a2a27b1163f450b86d5633a8a878c67fb895d435d49fb0f2f6461e43138f ports: - '10051:10051' depends_on: @@ -43,7 +43,7 @@ services: ZBX_DEBUGLEVEL: 3 zabbix-web: - image: zabbix/zabbix-web-nginx-pgsql:alpine-6.0-latest + image: zabbix/zabbix-web-nginx-pgsql:alpine-6.0-latest@sha256:e034dd99e711ebb3c28ae87750b818279b857504cdac9be521743ecfbc9711e0 ports: - '443:443' - '8188:8080' @@ -64,7 +64,7 @@ services: POSTGRES_DB: zabbix database: - image: postgres:15 + image: postgres:15@sha256:a7711af921c380de0fda7c48a61fab5ac4def145fd9fc00ccea7355fd6270bb4 ports: - '15432:5432' command: postgres -c 'max_connections=1000' @@ -73,7 +73,7 @@ services: POSTGRES_PASSWORD: zabbix zabbix-agent: - image: zabbix/zabbix-agent:alpine-6.0-latest + image: zabbix/zabbix-agent:alpine-6.0-latest@sha256:9eab77e4f23e68746f935ab71f3c828a6bfc73b2e2783c5453d61a24f996bb6b environment: ZBX_SERVER_HOST: zabbix-server ZBX_SERVER_PORT: 10051 @@ -99,7 +99,7 @@ services: # backend redis_backend: - image: redis:alpine + image: redis:alpine@sha256:6cbef353e480a8a6e7f10ec545f13d7d3fa85a212cdcc5ffaf5a1c818b9d3798 zas_backend_01: build: ../zas-agent @@ -118,7 +118,7 @@ services: # frontend redis_frontend: - image: redis:alpine + image: redis:alpine@sha256:6cbef353e480a8a6e7f10ec545f13d7d3fa85a212cdcc5ffaf5a1c818b9d3798 zas_frontend_01: build: ../zas-agent diff --git a/devenv/zabbix70/bootstrap/Dockerfile b/devenv/zabbix70/bootstrap/Dockerfile index ac31af8..7e5fa75 100644 --- a/devenv/zabbix70/bootstrap/Dockerfile +++ b/devenv/zabbix70/bootstrap/Dockerfile @@ -1,4 +1,4 @@ -FROM python:3.12-slim-bullseye +FROM python:3.12-slim-bullseye@sha256:411fa4dcfdce7e7a3057c45662beba9dcd4fa36b2e50a2bfcd6c9333e59bf0db ENV ZBX_API_URL=http://zabbix-web:8080 ENV ZBX_API_USER="Admin" diff --git a/devenv/zabbix70/docker-compose.yml b/devenv/zabbix70/docker-compose.yml index f2b5fee..493e620 100644 --- a/devenv/zabbix70/docker-compose.yml +++ b/devenv/zabbix70/docker-compose.yml @@ -1,6 +1,6 @@ services: ssl-cert: - image: alpine:latest + image: alpine:latest@sha256:865b95f46d98cf867a156fe4a135ad3fe50d2056aa3f25ed31662dff6da4eb62 command: | sh -c "if [ ! -f /certs/nginx.crt ] || [ ! -f /certs/nginx.key ]; then apk add --no-cache openssl && @@ -26,7 +26,7 @@ services: # Zabbix zabbix-server: - image: zabbix/zabbix-server-pgsql:alpine-7.0-latest + image: zabbix/zabbix-server-pgsql:alpine-7.0-latest@sha256:b3c1451adf27e28741fe3b2b3b614c52b0ac68f749b2515224536ef2c1474473 ports: - '10051:10051' depends_on: @@ -43,7 +43,7 @@ services: ZBX_DEBUGLEVEL: 3 zabbix-web: - image: zabbix/zabbix-web-nginx-pgsql:alpine-7.0-latest + image: zabbix/zabbix-web-nginx-pgsql:alpine-7.0-latest@sha256:08b2b13e1c92f8cdce81238cdbbb89d1fbc5863e5e7ba0310406212d87988d53 ports: - '443:443' - '8188:8080' @@ -64,7 +64,7 @@ services: POSTGRES_DB: zabbix database: - image: postgres:16 + image: postgres:16@sha256:056b54f00419b49289227ab12d09df508543883f407fe9935a2cec430ef8aa8d ports: - '15432:5432' command: postgres -c 'max_connections=1000' @@ -73,7 +73,7 @@ services: POSTGRES_PASSWORD: zabbix zabbix-agent: - image: zabbix/zabbix-agent:alpine-7.0-latest + image: zabbix/zabbix-agent:alpine-7.0-latest@sha256:71f1f22b3828f47b714a1bbef39b456453e0e552461d138f36e18a35732302ba environment: ZBX_SERVER_HOST: zabbix-server ZBX_SERVER_PORT: 10051 @@ -99,7 +99,7 @@ services: # backend redis_backend: - image: redis:alpine + image: redis:alpine@sha256:6cbef353e480a8a6e7f10ec545f13d7d3fa85a212cdcc5ffaf5a1c818b9d3798 zas_backend_01: build: ../zas-agent @@ -118,7 +118,7 @@ services: # frontend redis_frontend: - image: redis:alpine + image: redis:alpine@sha256:6cbef353e480a8a6e7f10ec545f13d7d3fa85a212cdcc5ffaf5a1c818b9d3798 zas_frontend_01: build: ../zas-agent diff --git a/devenv/zabbix72/bootstrap/Dockerfile b/devenv/zabbix72/bootstrap/Dockerfile index ac31af8..7e5fa75 100644 --- a/devenv/zabbix72/bootstrap/Dockerfile +++ b/devenv/zabbix72/bootstrap/Dockerfile @@ -1,4 +1,4 @@ -FROM python:3.12-slim-bullseye +FROM python:3.12-slim-bullseye@sha256:411fa4dcfdce7e7a3057c45662beba9dcd4fa36b2e50a2bfcd6c9333e59bf0db ENV ZBX_API_URL=http://zabbix-web:8080 ENV ZBX_API_USER="Admin" diff --git a/devenv/zabbix72/docker-compose.yml b/devenv/zabbix72/docker-compose.yml index 99cab9c..5032f95 100644 --- a/devenv/zabbix72/docker-compose.yml +++ b/devenv/zabbix72/docker-compose.yml @@ -12,7 +12,7 @@ services: # Zabbix zabbix-server: - image: zabbix/zabbix-server-pgsql:alpine-7.2-latest + image: zabbix/zabbix-server-pgsql:alpine-7.2-latest@sha256:5c1aeceb24d6a07b64667a97d42053e3421c207aec39aca86d87980a30b01f5b ports: - '10051:10051' depends_on: @@ -29,7 +29,7 @@ services: ZBX_DEBUGLEVEL: 3 zabbix-web: - image: zabbix/zabbix-web-apache-pgsql:alpine-7.2-latest + image: zabbix/zabbix-web-apache-pgsql:alpine-7.2-latest@sha256:70a301e5c25b9db11bde09ec5b1ba5c25480c3c63e70f01d51534d9648627ff6 ports: - '8188:8080' depends_on: @@ -45,7 +45,7 @@ services: POSTGRES_DB: zabbix database: - image: postgres:16 + image: postgres:16@sha256:056b54f00419b49289227ab12d09df508543883f407fe9935a2cec430ef8aa8d ports: - '15432:5432' command: postgres -c 'max_connections=1000' @@ -54,7 +54,7 @@ services: POSTGRES_PASSWORD: zabbix zabbix-agent: - image: zabbix/zabbix-agent:alpine-7.2-latest + image: zabbix/zabbix-agent:alpine-7.2-latest@sha256:0bb96e2afe24c71dcd38e16f9dff6e56b4aebadff5267ce354b39a79f4a07255 environment: ZBX_SERVER_HOST: zabbix-server ZBX_SERVER_PORT: 10051 @@ -80,7 +80,7 @@ services: # backend redis_backend: - image: redis:alpine + image: redis:alpine@sha256:6cbef353e480a8a6e7f10ec545f13d7d3fa85a212cdcc5ffaf5a1c818b9d3798 zas_backend_01: build: ../zas-agent @@ -99,7 +99,7 @@ services: # frontend redis_frontend: - image: redis:alpine + image: redis:alpine@sha256:6cbef353e480a8a6e7f10ec545f13d7d3fa85a212cdcc5ffaf5a1c818b9d3798 zas_frontend_01: build: ../zas-agent diff --git a/devenv/zabbix74/bootstrap/Dockerfile b/devenv/zabbix74/bootstrap/Dockerfile index bb92a63..2088c3b 100644 --- a/devenv/zabbix74/bootstrap/Dockerfile +++ b/devenv/zabbix74/bootstrap/Dockerfile @@ -1,4 +1,4 @@ -FROM python:3.13-slim-bookworm +FROM python:3.13-slim-bookworm@sha256:0c5171fd1e80d3133604e1006aa5f788c5f020631537dd1e09edcbe874bb8192 ENV ZBX_API_URL=http://zabbix-web:8080 ENV ZBX_API_USER="Admin" diff --git a/devenv/zabbix74/docker-compose.yml b/devenv/zabbix74/docker-compose.yml index 6c879db..503572f 100644 --- a/devenv/zabbix74/docker-compose.yml +++ b/devenv/zabbix74/docker-compose.yml @@ -12,7 +12,7 @@ services: # Zabbix zabbix-server: - image: zabbix/zabbix-server-pgsql:alpine-7.4-latest + image: zabbix/zabbix-server-pgsql:alpine-7.4-latest@sha256:a6f748d96bfa4d361df5e9284eba041c475e7ff26c1358f8f189969437ebdb9b ports: - '10051:10051' depends_on: @@ -29,7 +29,7 @@ services: ZBX_DEBUGLEVEL: 3 zabbix-web: - image: zabbix/zabbix-web-apache-pgsql:alpine-7.4-latest + image: zabbix/zabbix-web-apache-pgsql:alpine-7.4-latest@sha256:9b5ad53c684c9f5d7b15c626e22e3d2c97c2b0b2b05ce811d1a8fe42416cd01b ports: - '8188:8080' depends_on: @@ -45,7 +45,7 @@ services: POSTGRES_DB: zabbix database: - image: postgres:16 + image: postgres:16@sha256:056b54f00419b49289227ab12d09df508543883f407fe9935a2cec430ef8aa8d ports: - '15432:5432' command: postgres -c 'max_connections=1000' @@ -54,7 +54,7 @@ services: POSTGRES_PASSWORD: zabbix zabbix-agent: - image: zabbix/zabbix-agent:alpine-7.4-latest + image: zabbix/zabbix-agent:alpine-7.4-latest@sha256:2a5989f552e70c1a7d48870ff6002ebbcda1a907e42046851aeae9feba614ac4 environment: ZBX_SERVER_HOST: zabbix-server ZBX_SERVER_PORT: 10051 @@ -80,7 +80,7 @@ services: # backend redis_backend: - image: redis:alpine + image: redis:alpine@sha256:6cbef353e480a8a6e7f10ec545f13d7d3fa85a212cdcc5ffaf5a1c818b9d3798 zas_backend_01: build: ../zas-agent @@ -99,7 +99,7 @@ services: # frontend redis_frontend: - image: redis:alpine + image: redis:alpine@sha256:6cbef353e480a8a6e7f10ec545f13d7d3fa85a212cdcc5ffaf5a1c818b9d3798 zas_frontend_01: build: ../zas-agent diff --git a/devenv/zas-agent/Dockerfile b/devenv/zas-agent/Dockerfile index 0910ee0..0deb320 100644 --- a/devenv/zas-agent/Dockerfile +++ b/devenv/zas-agent/Dockerfile @@ -1,4 +1,4 @@ -FROM python:2.7 +FROM python:2.7@sha256:cfa62318c459b1fde9e0841c619906d15ada5910d625176e24bf692cf8a2601d # ENV ZAS_SOURCE_URL=https://github.com/vulogov/zas_agent/archive/master.zip # ENV ZAS_ARC_NAME=zas_agent-master diff --git a/package.json b/package.json index af0d3a0..8c8daf4 100644 --- a/package.json +++ b/package.json @@ -54,7 +54,7 @@ "@swc/helpers": "0.5.18", "@swc/jest": "0.2.39", "@tanstack/react-table": "8.21.3", - "@testing-library/dom": "^10.4.1", + "@testing-library/dom": "10.4.1", "@testing-library/jest-dom": "6.9.1", "@testing-library/react": "16.3.1", "@types/grafana": "github:CorpGlory/types-grafana", diff --git a/yarn.lock b/yarn.lock index 9dde7c3..33c8093 100644 --- a/yarn.lock +++ b/yarn.lock @@ -3567,7 +3567,7 @@ __metadata: languageName: node linkType: hard -"@testing-library/dom@npm:^10.4.1": +"@testing-library/dom@npm:10.4.1": version: 10.4.1 resolution: "@testing-library/dom@npm:10.4.1" dependencies: @@ -7561,7 +7561,7 @@ __metadata: "@swc/helpers": "npm:0.5.18" "@swc/jest": "npm:0.2.39" "@tanstack/react-table": "npm:8.21.3" - "@testing-library/dom": "npm:^10.4.1" + "@testing-library/dom": "npm:10.4.1" "@testing-library/jest-dom": "npm:6.9.1" "@testing-library/react": "npm:16.3.1" "@types/grafana": "github:CorpGlory/types-grafana"