volker.raschek/dcmerge
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 10 Wiki Activity
331 Commits 1 Branch 20 Tags
011f20294814303677fd36b99624e83c29b39a15
Commit Graph

331 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
volker.raschek 751bb810d2 fix(dockerCompose): protect of empty attributes v0.2.0 2023-08-28 11:37:24 +02:00
volker.raschek 9b469bd8c6 fix: rename firstWin to existingWin 2023-08-28 11:13:32 +02:00
volker.raschek 4ad9da6d63 fix(cmd): add flag first-win 2023-08-28 10:57:36 +02:00
volker.raschek 2ea83b7591 fix(dockerCompose): add MergeFirstWin() 2023-08-28 10:57:36 +02:00
volker.raschek 6f673e4a72 test: add example docker-compose 2023-08-28 10:57:36 +02:00
volker.raschek d9ecf068c9 fix(dockerCompose): add Service.MergeFirstWin() 2023-08-28 10:57:36 +02:00
volker.raschek 4c3c6cd5d2 fix(dockerCompose): add ServiceDeploy.MergeFirstWin() 2023-08-28 10:57:36 +02:00
volker.raschek 23290fbd5d fix(dockerCompose): add ServiceDeployResources.MergeFirstWin() 2023-08-28 10:57:36 +02:00
volker.raschek 07673bfd53 fix(dockerCompose): add ServiceDeployResourcesLimits.MergeFirstWin() 2023-08-28 10:57:36 +02:00
volker.raschek 405a0258f1 fix(dockerCompose): add ServiceNetwork.MergeFirstWin() 2023-08-28 10:57:36 +02:00
volker.raschek 462299d5cd fix(dockerCompose): add ServiceUlimits.MergeFirstWin() 2023-08-28 10:57:36 +02:00
volker.raschek 6524785871 test(dockerCompose): add ServiceUlimitsNoFile.MergeFirstWin() 2023-08-28 10:57:36 +02:00
volker.raschek 1207bcfcab test(dockerCompose): add Volume.MergeFirstWin() 2023-08-28 10:57:36 +02:00
volker.raschek a656dc2db1 fix(dockerCompose): add ServiceUlimitsNoFile.MergeFirstWin() 2023-08-28 10:57:36 +02:00
volker.raschek 14c645dd96 fix(dockerCompose): add Volume.MergeFirstWin() 2023-08-28 10:57:36 +02:00
volker.raschek 7b0109caf4 Merge pull request 'chore(deps): update dependency docker.io/library/golang to v1.21.0' (#6) from renovate/docker.io-library-golang-1.x into master
continuous-integration/drone/push Build is passing
Details 
Reviewed-on: #6
 2023-08-16 17:48:01 +00:00
CSRBot 6bfd49947e chore(deps): update dependency docker.io/library/golang to v1.21.0
continuous-integration/drone/push Build is passing
Details
continuous-integration/drone/pr Build is passing
Details
2023-08-10 15:41:23 +02:00
CSRBot 04e0d98dde chore(deps): update dependency docker.io/library/alpine to v3.18.3
continuous-integration/drone/pr Build is passing
Details
continuous-integration/drone/push Build is passing
Details
2023-08-07 23:42:48 +02:00
volker.raschek 87ec3349ea fix(ci): execute linter and unit-test in parallel
continuous-integration/drone/push Build is passing
Details
2023-08-02 23:26:19 +02:00
volker.raschek ad1cf8cbef fix(ci): execute unit tests on dry-run
continuous-integration/drone/push Build encountered an error
Details
2023-08-02 23:20:38 +02:00
volker.raschek 16f1f5e9da fix(ci): execute unit tests
continuous-integration/drone/push Build is passing
Details
2023-08-02 23:19:08 +02:00
CSRBot 35d35f0b20 chore(deps): update dependency docker.io/library/golang to v1.20.7
continuous-integration/drone/pr Build is passing
Details
continuous-integration/drone/push Build is passing
Details
2023-08-02 00:43:07 +02:00
CSRBot 0375ccbf69 chore(deps): update dependency quay.io/skopeo/stable to v1.13.1
continuous-integration/drone/pr Build is passing
Details
continuous-integration/drone/push Build is passing
Details
2023-07-31 01:22:48 +02:00
volker.raschek ce48d6dd0c fix(dockerCompose): mergeLastWinImage
continuous-integration/drone/push Build is passing
Details
v0.1.1 		2023-07-26 14:44:12 +02:00
volker.raschek 3bf9380001 fix(cmd): expect at least one argument
continuous-integration/drone/push Build is passing
Details
v0.1.0 		2023-07-26 10:43:49 +02:00
volker.raschek f7c1664197 fix(cmd): adapt default output
continuous-integration/drone/push Build is passing
Details
2023-07-26 10:37:56 +02:00
volker.raschek cadf25b089 fix(cmd): rename flag to last-win
continuous-integration/drone/push Build is passing
Details
2023-07-26 10:28:08 +02:00
volker.raschek c50c0a835e fix(gomod): downgrade to yaml v2.0
continuous-integration/drone/push Build is passing
Details
2023-07-26 10:17:32 +02:00
volker.raschek c16871010c style(README): add newline
continuous-integration/drone/push Build is passing
Details
2023-07-26 10:16:15 +02:00
volker.raschek ad29107f60 style(README): rm newline 2023-07-26 10:16:08 +02:00
volker.raschek 3777c49ee9 Initial Commit
continuous-integration/drone/push Build is passing
Details
continuous-integration/drone Build is passing
Details
2023-07-26 09:57:40 +02:00