test: resolve develop to test conflicts #185
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
MSzalowski
requested review from
placek,
adgud,
kickloop,
jankun4,
Sworzen1 and
JanJaroszczak
as code owners
…ssue Summary: In response to a critical issue where the SanchoNet Cardano DB Sync Docker image failed to correctly parse configuration files for the SanchoNet environment, this commit introduces a hotfix. The resolution involved modifying the entrypoint script to allow for dynamic configuration based on external files rather than hardcoded values. This was achieved by adding additional volumes to the DBSync container for configuration files and execution scripts, ensuring the DBSync component can operate with the correct settings sourced from the official documentation. Technical Details: The changes include the creation of new scripts (govtool-dbsync, govtool-entrypoint, and govtool-sanchonet) within the scripts/govtool/dbsync directory. These scripts are designed as one-to-one replacements for the original scripts but with modifications to the paths, enabling the use of target configurations from a custom volume. Furthermore, the docker-compose.sanchonet.yml file was updated to incorporate these new scripts through volume mounts, ensuring the DBSync component utilizes the correct configurations at runtime. The prepare-config.sh script was also modified to prepare a scripts directory specifically for the DBSync entrypoint, including copying the newly created scripts into the target configuration directory. This ensures that upon deployment, the DBSync service is equipped with all necessary custom scripts to correctly interpret the environment-specific configurations. This hotfix has been tested in a development environment by triggering deployment from a local machine, confirming its effectiveness in resolving the configuration parsing issue without introducing any new problems or dependencies. This approach not only addresses the immediate problem but also enhances the flexibility of the deployment process for the SanchoNet Cardano DB Sync service within a Docker environment. Note: This solution is a temporary workaround pending a permanent fix for the configuration parsing issue. It emphasizes the importance of maintaining adaptability in deployment scripts and configurations to accommodate changes in the underlying infrastructure or application requirements. Related issue: IntersectMBO/cardano-db-sync#1629
…ration issue" This reverts commit b55a3a9. There is a solution made for IntersectMBO/cardano-db-sync#1629 involving a new image release. The new image is ghcr.io/intersectmbo/cardano-db-sync:sancho-4-0-0-fix-config. We will use the official solution instead of my hotfix, hence this revert. We also want to document our efforts that's why we do not simply romowe the reverted commit from the history.
pmbinapps
reviewed
Feb 16, 2024
pmbinapps
approved these changes
Feb 16, 2024
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Important
This pr introduces recent changes delivered to
develop. However, due to wrong bases (teststarts frommainanddevelopstarts frommain) commits under them have different IDs. This resulted in mergingdeveloptotestending with conflicts that cannot be solved with the current repository configuration.The next action should be the final cleanup of the branches as the approach introduced with this PR should never be a final solution as it is the workaround to the process that we have.
Workaround to the develop -> test conflicts on pull request
Instead of merging
developtotestI have cherry-picked the commits published todevelopto put them in totestbranch.List of changes
301d43c7e8cfe4ab6d0c4e63931eb9b319f574e94ec99aa0f16c8814a1edbd3885c1c1bc41a13b2c-[Fix misleading metadata hash text #90] 1eb5c77
-[Fix configuration issue for SanchoNet Cardano DB Sync in Docker environment #181] 7adf4a2
Checklist