forked from wazuh/wazuh-docker
Resolving cnoflicts
This commit is contained in:
@@ -14,6 +14,7 @@ All notable changes to this project will be documented in this file.
|
|||||||
### Fixed
|
### Fixed
|
||||||
|
|
||||||
- Fix WAZUH_AGENT_GROUP variable ([#2262](https://github.com/wazuh/wazuh-docker/pull/2262))
|
- Fix WAZUH_AGENT_GROUP variable ([#2262](https://github.com/wazuh/wazuh-docker/pull/2262))
|
||||||
|
- Fix bumper script early exit ([#2261](https://github.com/wazuh/wazuh-docker/pull/2261))
|
||||||
|
|
||||||
### Deleted
|
### Deleted
|
||||||
|
|
||||||
|
|||||||
@@ -146,11 +146,6 @@ main() {
|
|||||||
# Get old version and stage
|
# Get old version and stage
|
||||||
get_old_version_and_stage
|
get_old_version_and_stage
|
||||||
|
|
||||||
if [[ "${OLD_VERSION}" == "${VERSION}" && "${OLD_STAGE}" == "${STAGE}" ]]; then
|
|
||||||
echo "Version and stage are already up to date." | tee -a "${LOG_FILE}"
|
|
||||||
echo "No changes needed." | tee -a "${LOG_FILE}"
|
|
||||||
exit 0
|
|
||||||
fi
|
|
||||||
if [[ "${OLD_VERSION}" != "${VERSION}" ]]; then
|
if [[ "${OLD_VERSION}" != "${VERSION}" ]]; then
|
||||||
echo "Updating version from ${OLD_VERSION} to ${VERSION}" | tee -a "${LOG_FILE}"
|
echo "Updating version from ${OLD_VERSION} to ${VERSION}" | tee -a "${LOG_FILE}"
|
||||||
update_version_in_files "${VERSION}"
|
update_version_in_files "${VERSION}"
|
||||||
|
|||||||
Reference in New Issue
Block a user