Commit Graph

Select branches

Hide Pull Requests

master

#1

#10

#11

#12

#13

#14

#15

#16

#17

#18

#19

#2

#20

#21

#22

#23

#24

#25

#26

#27

#28

#29

#3

#30

#31

#32

#33

#34

#35

#36

#37

#38

#39

#4

#40

#41

#42

#43

#44

#45

#46

#47

#48

#49

#5

#50

#51

#52

#53

#54

#55

#56

#57

#58

#59

#6

#60

#61

#62

#63

#64

#65

#66

#67

#68

#69

#7

#70

#71

#72

#73

#74

#75

#76

#8

#9

v0.1.0

v0.1.1

v0.2.0

v0.3.0

v0.3.1

v0.3.2

v0.4.0

v0.4.1

v0.4.2

Mono Color

• 9669685997 chore(deps): update git.cryptic.systems/volker.raschek/markdownlint docker tag to v0.36.0 CSRBot 2023-09-03 13:52:59 +02:00
• 9a76f3432a chore(deps): update quay.io/skopeo/stable docker tag to v1.13.2 CSRBot 2023-08-29 22:02:10 +02:00
• 751bb810d2
  
  fix(dockerCompose): protect of empty attributes v0.2.0 Markus Pesch 2023-08-28 11:37:24 +02:00
• 9b469bd8c6
  
  fix: rename firstWin to existingWin Markus Pesch 2023-08-28 11:13:32 +02:00
• 4ad9da6d63
  
  fix(cmd): add flag first-win Markus Pesch 2023-08-28 10:57:26 +02:00
• 2ea83b7591
  
  fix(dockerCompose): add MergeFirstWin() Markus Pesch 2023-08-28 10:57:07 +02:00
• 6f673e4a72
  
  test: add example docker-compose Markus Pesch 2023-08-28 10:56:39 +02:00
• d9ecf068c9
  
  fix(dockerCompose): add Service.MergeFirstWin() Markus Pesch 2023-08-27 21:10:13 +02:00
• 4c3c6cd5d2
  
  fix(dockerCompose): add ServiceDeploy.MergeFirstWin() Markus Pesch 2023-08-27 19:56:49 +02:00
• 23290fbd5d
  
  fix(dockerCompose): add ServiceDeployResources.MergeFirstWin() Markus Pesch 2023-08-27 19:44:58 +02:00
• 07673bfd53
  
  fix(dockerCompose): add ServiceDeployResourcesLimits.MergeFirstWin() Markus Pesch 2023-08-27 19:35:54 +02:00
• 405a0258f1
  
  fix(dockerCompose): add ServiceNetwork.MergeFirstWin() Markus Pesch 2023-08-27 19:12:00 +02:00
• 462299d5cd
  
  fix(dockerCompose): add ServiceUlimits.MergeFirstWin() Markus Pesch 2023-08-27 19:04:28 +02:00
• 6524785871
  
  test(dockerCompose): add ServiceUlimitsNoFile.MergeFirstWin() Markus Pesch 2023-08-27 18:58:41 +02:00
• 1207bcfcab
  
  test(dockerCompose): add Volume.MergeFirstWin() Markus Pesch 2023-08-27 18:57:27 +02:00
• a656dc2db1
  
  fix(dockerCompose): add ServiceUlimitsNoFile.MergeFirstWin() Markus Pesch 2023-08-27 18:55:55 +02:00
• 14c645dd96
  
  fix(dockerCompose): add Volume.MergeFirstWin() Markus Pesch 2023-08-27 18:53:24 +02:00
• 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 Markus Pesch 2023-08-16 17:48:01 +00:00
• 6bfd49947e chore(deps): update dependency docker.io/library/golang to v1.21.0 CSRBot 2023-08-10 15:41:23 +02:00
• 04e0d98dde chore(deps): update dependency docker.io/library/alpine to v3.18.3 CSRBot 2023-08-07 23:42:48 +02:00
• 87ec3349ea
  
  fix(ci): execute linter and unit-test in parallel Markus Pesch 2023-08-02 23:26:19 +02:00
• ad1cf8cbef
  
  fix(ci): execute unit tests on dry-run Markus Pesch 2023-08-02 23:20:38 +02:00
• 16f1f5e9da
  
  fix(ci): execute unit tests Markus Pesch 2023-08-02 23:02:59 +02:00
• 35d35f0b20 chore(deps): update dependency docker.io/library/golang to v1.20.7 CSRBot 2023-08-02 00:43:07 +02:00
• 0375ccbf69 chore(deps): update dependency quay.io/skopeo/stable to v1.13.1 CSRBot 2023-07-31 01:22:48 +02:00
• ce48d6dd0c
  
  fix(dockerCompose): mergeLastWinImage v0.1.1 Markus Pesch 2023-07-26 14:44:12 +02:00
• 3bf9380001
  
  fix(cmd): expect at least one argument v0.1.0 Markus Pesch 2023-07-26 10:43:49 +02:00
• f7c1664197
  
  fix(cmd): adapt default output Markus Pesch 2023-07-26 10:37:56 +02:00
• cadf25b089
  
  fix(cmd): rename flag to last-win Markus Pesch 2023-07-26 10:28:08 +02:00
• c50c0a835e
  
  fix(gomod): downgrade to yaml v2.0 Markus Pesch 2023-07-26 10:17:32 +02:00
• c16871010c
  
  style(README): add newline Markus Pesch 2023-07-26 10:16:15 +02:00
• ad29107f60
  
  style(README): rm newline Markus Pesch 2023-07-26 10:16:08 +02:00
• 3777c49ee9
  
  Initial Commit Markus Pesch 2023-07-19 21:44:02 +02:00