Code

Merge 4.10.2 into master#1584

Code

Merged

teddytpc1 merged 67 commits intomasterwazuh/wazuh-docker:masterfrom merge-4.10.2-into-masterwazuh/wazuh-docker:merge-4.10.2-into-masterCopy head branch name to clipboardOct 17, 2024

+273-118

Commits

Commits on Sep 5, 2024

• Modify check repository for image builder

  vcerenu

  committed
  73fffcf

  Copy full SHA for 73fffcf

• Add delete of wazuh yum repo

  vcerenu

  committed
  8e7b2cd

  Copy full SHA for 8e7b2cd

Commits on Sep 12, 2024

• Merge pull request #1525 from wazuh/enhancement/1509-modify-check-repository-script

  Show description for 9c33d34
  teddytpc1

  authored
  9c33d34

  Copy full SHA for 9c33d34

• * Update the Procedure push docker images workflow file

  Show description for b38b3c7
  YisDav

  committed
  b38b3c7

  Copy full SHA for b38b3c7

Commits on Sep 13, 2024

• Updated SECURITY.md file

  davidcr01

  committed
  84280fa

  Copy full SHA for 84280fa

• Merge pull request #1523 from wazuh/change/1522-update-security-policy

  Show description for 82955c0
  c-bordon

  authored
  82955c0

  Copy full SHA for 82955c0

• Update changelog

  YisDav

  committed
  471aeda

  Copy full SHA for 471aeda

• Merge pull request #1524 from wazuh/enhancement/5651-new-workflow-push-docker-images

  Show description for 5771c49
  YisDav

  authored
  5771c49

  Copy full SHA for 5771c49

Commits on Sep 16, 2024

• Changed SECURITY.md file

  c-bordon

  committed
  4ea8fc2

  Copy full SHA for 4ea8fc2

• Merge pull request #1530 from wazuh/change/1529-update-security-policy-new-format

  Show description for e06d5ae
  c-bordon

  authored
  e06d5ae

  Copy full SHA for e06d5ae

Commits on Sep 20, 2024

• Bump revision to 40911

  Enaraque

  committed
  3859ca3

  Copy full SHA for 3859ca3

• Merge pull request #1532 from wazuh/enhancement/1531-bump-revision-to-40911

  davidcr01

  authored
  c28d104

  Copy full SHA for c28d104

• Add rc1 tag to docker-compose files

  Enaraque

  committed
  9d851e6

  Copy full SHA for 9d851e6

• Merge pull request #1533 from wazuh/enhancement/1531-change-image-tag

  Show description for a335684
  teddytpc1

  authored
  a335684

  Copy full SHA for a335684

• Revert rc1 tag from docker compose files

  Enaraque

  committed
  189e875

  Copy full SHA for 189e875

• Merge pull request #1534 from wazuh/enhancement/1531-revert-image-tag

  Show description for 0b3e9ba
  davidcr01

  authored
  0b3e9ba

  Copy full SHA for 0b3e9ba

Commits on Sep 23, 2024

• Merge branch '4.8.2' into merge-4.8.2-into-4.9.0

  davidcr01

  committed
  301ea9e

  Copy full SHA for 301ea9e

• Merge pull request #1537 from wazuh/merge-4.9.1-into-4.10.0

  Show description for 7b1d283
  davidcr01

  authored
  7b1d283

  Copy full SHA for 7b1d283

Commits on Sep 24, 2024

• Bumped revision for 4.10.0-alpha1

  davidcr01

  committed
  42db717

  Copy full SHA for 42db717

• Merge pull request #1539 from wazuh/enhancement/1535-bump-revision

  Show description for e08a3d8
  davidcr01

  authored
  e08a3d8

  Copy full SHA for e08a3d8

• Changed image tag for 4.10.0-alpha1

  davidcr01

  committed
  8ab3018

  Copy full SHA for 8ab3018

• Merge pull request #1540 from wazuh/enhancement/1535-change-tag

  Show description for 6dfa4a2
  davidcr01

  authored
  6dfa4a2

  Copy full SHA for 6dfa4a2

• Reverted image tag for 4.10.0-alpha1

  davidcr01

  committed
  9e1c332

  Copy full SHA for 9e1c332

• Merge pull request #1541 from wazuh/enhancement/1535-revert-tag

  Show description for 9d882fc
  davidcr01

  authored
  9d882fc

  Copy full SHA for 9d882fc

• Bump new Wazuh 4.10.1 version

  vcerenu

  committed
  08ba82d

  Copy full SHA for 08ba82d

• Merge pull request #1544 from wazuh/enhancement/1543-bump-4.10.1-version

  Show description for 46d6dc8
  c-bordon

  authored
  46d6dc8

  Copy full SHA for 46d6dc8

Commits on Sep 27, 2024

• Bump 4.9.1 revision

  c-bordon

  committed
  eb4efb3

  Copy full SHA for eb4efb3

• Merge pull request #1548 from wazuh/enhancement/1418-support-new-stage-rc2-for-491

  Show description for e292957
  davidcr01

  authored
  e292957

  Copy full SHA for e292957

• Updated Wazuh images to -rc2 version

  c-bordon

  committed
  62ae93e

  Copy full SHA for 62ae93e

• Merge pull request #1549 from wazuh/enhancement/1547-update-docker-image-tag

  Show description for be0ac01
  davidcr01

  authored
  be0ac01

  Copy full SHA for be0ac01

• Revert Wazuh images to -rc2 version

  c-bordon

  committed
  0ec38df

  Copy full SHA for 0ec38df

• Merge pull request #1550 from wazuh/enhancement/1547-revert-docker-image-tag

  Show description for af023a9
  teddytpc1

  authored
  af023a9

  Copy full SHA for af023a9

Commits on Sep 30, 2024

• Update Procedure_push_docker_images.yml

  YisDav

  committed
  027b260

  Copy full SHA for 027b260

Commits on Oct 1, 2024

• Change the dev default value to true for the workflow_dispatch

  YisDav

  committed
  8bafe12

  Copy full SHA for 8bafe12

• Merge pull request #1551 from wazuh/enhancement/1864-improve-push-docker-images-workflow

  Show description for cc20665
  teddytpc1

  authored
  cc20665

  Copy full SHA for cc20665

Commits on Oct 3, 2024

• Revert create_user.py script deletion

  Enaraque

  committed
  92d0582

  Copy full SHA for 92d0582

• Merge pull request #1555 from wazuh/bug/1554-wazuh-server-container-restarting-in-loop

  Show description for d237faa
  c-bordon

  authored
  d237faa

  Copy full SHA for d237faa

• Bumped branch 4.10.2 to 4.10.2 version

  c-bordon

  committed
  e6c5e82

  Copy full SHA for e6c5e82

• Merge pull request #1557 from wazuh/Bump-4.10.2-branch

  Show description for 447c0bd
  c-bordon

  authored
  447c0bd

  Copy full SHA for 447c0bd

Commits on Oct 4, 2024

• Bumped revision for 4.9.1-RC3

  davidcr01

  committed
  884151b

  Copy full SHA for 884151b

• Merge pull request #1559 from wazuh/enhancement/1558-bump-revision

  Show description for 97e4dde
  davidcr01

  authored
  97e4dde

  Copy full SHA for 97e4dde

• Changed image tag for 4.9.1-rc3

  davidcr01

  committed
  4177d10

  Copy full SHA for 4177d10

• Merge pull request #1560 from wazuh/enhancement/1558-change-image-tag

  Show description for bd7aedc
  davidcr01

  authored
  bd7aedc

  Copy full SHA for bd7aedc

• Reverted image tag for 4.9.1-rc3

  davidcr01

  committed
  868c371

  Copy full SHA for 868c371

• Merge pull request #1561 from wazuh/enhancement/1558-revert-image-tag

  Show description for 61b3f5f
  davidcr01

  authored
  61b3f5f

  Copy full SHA for 61b3f5f

Commits on Oct 10, 2024

• Resolving merge conflicts

  vcerenu

  committed
  8695a08

  Copy full SHA for 8695a08

• Merge pull request #1568 from wazuh/merge-4.9.1-into-4.10.0

  Show description for 06a797d
  teddytpc1

  authored
  06a797d

  Copy full SHA for 06a797d

• Fix typos

  vcerenu

  committed
  1aa1499

  Copy full SHA for 1aa1499

• Add changelog

  vcerenu

  committed
  f61af29

  Copy full SHA for f61af29

• Merge pull request #1569 from wazuh/bug/1564-fix-typos-entrypoint

  Show description for 6074636
  teddytpc1

  authored
  6074636

  Copy full SHA for 6074636

• Bump revision

  YisDav

  committed
  dbb7766

  Copy full SHA for dbb7766

• Merge pull request #1571 from wazuh/enhancement/1570-add-support-for-alpha-2

  Show description for 50769ef
  c-bordon

  authored
  50769ef

  Copy full SHA for 50769ef

• Update docker-compose versions

  YisDav

  committed
  db4133d

  Copy full SHA for db4133d

• Merge pull request #1572 from wazuh/enhancement/1570-docker-compose-version

  Show description for 424846a
  teddytpc1

  authored
  424846a

  Copy full SHA for 424846a

• Revert image tag to 4.10.0

  YisDav

  committed
  5795fa1

  Copy full SHA for 5795fa1

• Merge pull request #1573 from wazuh/enhancement/1570-revert-image-tag

  Show description for b1f0a1f
  teddytpc1

  authored
  b1f0a1f

  Copy full SHA for b1f0a1f

Commits on Oct 15, 2024

• Bump revision

  vcerenu

  committed
  276c8a2

  Copy full SHA for 276c8a2

• change image taf for rc4

  vcerenu

  committed
  564e2b3

  Copy full SHA for 564e2b3

• Revert image tag for rc4

  vcerenu

  committed
  5bbaceb

  Copy full SHA for 5bbaceb

Commits on Oct 17, 2024

• Resolve conflicts

  vcerenu

  committed
  691694a

  Copy full SHA for 691694a

• Merge pull request #1581 from wazuh/merge-4.9.1-into-4-10-0

  Show description for f4e7d19
  teddytpc1

  authored
  f4e7d19

  Copy full SHA for f4e7d19

• Resolve conflicts

  vcerenu

  committed
  42977e3

  Copy full SHA for 42977e3

• Resolve conflicts

  vcerenu

  committed
  7ca14b9

  Copy full SHA for 7ca14b9

• Merge pull request #1582 from wazuh/merge-4.10.0-into-4.10.1

  Show description for ea0e679
  teddytpc1

  authored
  ea0e679

  Copy full SHA for ea0e679

• Resolve conflicts

  vcerenu

  committed
  a5c3138

  Copy full SHA for a5c3138

• Merge pull request #1583 from wazuh/merge-4.10.1-into-4.10.2

  Show description for f809a1e
  teddytpc1

  authored
  f809a1e

  Copy full SHA for f809a1e

• Resolve conflicts

  vcerenu

  committed
  69df531

  Copy full SHA for 69df531