Skip to content

Commit c3461a7

Browse files
david-garcia-garciadavid-garcia-garcia
committed
Merge remote-tracking branch 'origin' into 11147c
# Conflicts: # plugins/in_tail/tail.c # plugins/in_tail/tail_file.c
2 parents d3ddfb1 + 0512101 commit c3461a7

2,430 files changed

Lines changed: 174874 additions & 39927 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎.devcontainer/devcontainer.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
// docker-in-docker allows you to run Docker commands inside the dev container. Thus, it supports to build docker build in the environment.
1414
"ghcr.io/devcontainers/features/docker-in-docker:2": {
1515
"version": "latest",
16-
"moby": true,
16+
"moby": false,
1717
"dockerDashComposeVersion": "v1"
1818
}
1919
},

0 commit comments

Comments
 (0)