45 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
CSRBot	d7e8970860	Merge pull request 'chore(deps): update docker.io/plugins/docker docker tag to v20.17.0' (#1) from renovate/docker.io-plugins-docker-20.x into master	2023-10-31 02:06:11 +00:00
CSRBot	8603eca0b5	chore(deps): update docker.io/plugins/docker docker tag to v20.17.0	2023-10-30 23:05:33 +00:00
Markus Pesch	d8ada5578b	fix(ci): unsupport arm v7	2023-10-30 21:32:36 +01:00
CSRBot	4f5d115926	chore(deps): update docker.io/library/golang docker tag to v1.21.3	2023-10-11 07:49:22 +02:00
CSRBot	dac3be4e2d	chore(deps): update docker.io/library/golang docker tag to v1.21.2	2023-10-06 20:32:36 +02:00
CSRBot	173637693f	chore(deps): update git.cryptic.systems/volker.raschek/drone-email docker tag to v0.1.5	2023-10-03 19:18:35 +02:00
CSRBot	3ba641aa12	chore(deps): update git.cryptic.systems/volker.raschek/git docker tag to v1.3.1	2023-10-03 10:27:29 +02:00
CSRBot	768a49319d	chore(deps): update quay.io/skopeo/stable docker tag to v1.13.3	2023-09-29 00:38:35 +02:00
CSRBot	66f5fff92a	chore(deps): update docker.io/library/alpine docker tag to v3.18.4	2023-09-29 00:15:33 +02:00
CSRBot	b6b2e069cd	chore(deps): update git.cryptic.systems/volker.raschek/markdownlint docker tag to v0.37.0	2023-09-22 19:33:41 +02:00
CSRBot	2c738d0417	chore(deps): update docker.io/library/golang docker tag to v1.21.1	2023-09-06 21:31:18 +02:00
Markus Pesch	46dd067b48	fix(renovate): exclude updating docker.io/plugins/docker	2023-09-03 16:37:08 +02:00
CSRBot	9669685997	chore(deps): update git.cryptic.systems/volker.raschek/markdownlint docker tag to v0.36.0	2023-09-03 13:52:59 +02:00
CSRBot	9a76f3432a	chore(deps): update quay.io/skopeo/stable docker tag to v1.13.2	2023-08-29 22:02:10 +02:00
Markus Pesch	751bb810d2	fix(dockerCompose): protect of empty attributes	2023-08-28 11:37:24 +02:00
Markus Pesch	9b469bd8c6	fix: rename firstWin to existingWin	2023-08-28 11:13:32 +02:00
Markus Pesch	4ad9da6d63	fix(cmd): add flag first-win	2023-08-28 10:57:36 +02:00
Markus Pesch	2ea83b7591	fix(dockerCompose): add MergeFirstWin()	2023-08-28 10:57:36 +02:00
Markus Pesch	6f673e4a72	test: add example docker-compose	2023-08-28 10:57:36 +02:00
Markus Pesch	d9ecf068c9	fix(dockerCompose): add Service.MergeFirstWin()	2023-08-28 10:57:36 +02:00
Markus Pesch	4c3c6cd5d2	fix(dockerCompose): add ServiceDeploy.MergeFirstWin()	2023-08-28 10:57:36 +02:00
Markus Pesch	23290fbd5d	fix(dockerCompose): add ServiceDeployResources.MergeFirstWin()	2023-08-28 10:57:36 +02:00
Markus Pesch	07673bfd53	fix(dockerCompose): add ServiceDeployResourcesLimits.MergeFirstWin()	2023-08-28 10:57:36 +02:00
Markus Pesch	405a0258f1	fix(dockerCompose): add ServiceNetwork.MergeFirstWin()	2023-08-28 10:57:36 +02:00
Markus Pesch	462299d5cd	fix(dockerCompose): add ServiceUlimits.MergeFirstWin()	2023-08-28 10:57:36 +02:00
Markus Pesch	6524785871	test(dockerCompose): add ServiceUlimitsNoFile.MergeFirstWin()	2023-08-28 10:57:36 +02:00
Markus Pesch	1207bcfcab	test(dockerCompose): add Volume.MergeFirstWin()	2023-08-28 10:57:36 +02:00
Markus Pesch	a656dc2db1	fix(dockerCompose): add ServiceUlimitsNoFile.MergeFirstWin()	2023-08-28 10:57:36 +02:00
Markus Pesch	14c645dd96	fix(dockerCompose): add Volume.MergeFirstWin()	2023-08-28 10:57:36 +02:00
Markus Pesch	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 ... 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	2023-08-10 15:41:23 +02:00
CSRBot	04e0d98dde	chore(deps): update dependency docker.io/library/alpine to v3.18.3	2023-08-07 23:42:48 +02:00
Markus Pesch	87ec3349ea	fix(ci): execute linter and unit-test in parallel	2023-08-02 23:26:19 +02:00
Markus Pesch	ad1cf8cbef	fix(ci): execute unit tests on dry-run	2023-08-02 23:20:38 +02:00
Markus Pesch	16f1f5e9da	fix(ci): execute unit tests	2023-08-02 23:19:08 +02:00
CSRBot	35d35f0b20	chore(deps): update dependency docker.io/library/golang to v1.20.7	2023-08-02 00:43:07 +02:00
CSRBot	0375ccbf69	chore(deps): update dependency quay.io/skopeo/stable to v1.13.1	2023-07-31 01:22:48 +02:00
Markus Pesch	ce48d6dd0c	fix(dockerCompose): mergeLastWinImage	2023-07-26 14:44:12 +02:00
Markus Pesch	3bf9380001	fix(cmd): expect at least one argument	2023-07-26 10:43:49 +02:00
Markus Pesch	f7c1664197	fix(cmd): adapt default output	2023-07-26 10:37:56 +02:00
Markus Pesch	cadf25b089	fix(cmd): rename flag to last-win	2023-07-26 10:28:08 +02:00
Markus Pesch	c50c0a835e	fix(gomod): downgrade to yaml v2.0	2023-07-26 10:17:32 +02:00
Markus Pesch	c16871010c	style(README): add newline	2023-07-26 10:16:15 +02:00
Markus Pesch	ad29107f60	style(README): rm newline	2023-07-26 10:16:08 +02:00
Markus Pesch	3777c49ee9	Initial Commit	2023-07-26 09:57:40 +02:00