Code

Merge 4.10.0 into 4.10.1#1582

Code

Merged

teddytpc1 merged 35 commits into4.10.1wazuh/wazuh-docker:4.10.1from merge-4.10.0-into-4.10.1wazuh/wazuh-docker:merge-4.10.0-into-4.10.1Copy head branch name to clipboardOct 17, 2024

+124-32

Commits

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

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