Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
D
devcontainer-features
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
eazydevelop-devcontainer-temp
devcontainer-features
Commits
4fca96b5
Unverified
Commit
4fca96b5
authored
Oct 05, 2023
by
Samruddhi Khandale
Committed by
GitHub
Oct 05, 2023
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
[Docker-in-docker] Updates docker-init scripts (#715)
* updates * version bump
parent
0d7ad7c5
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
6 additions
and
6 deletions
+6
-6
devcontainer-feature.json
src/docker-in-docker/devcontainer-feature.json
+1
-1
install.sh
src/docker-in-docker/install.sh
+5
-5
No files found.
src/docker-in-docker/devcontainer-feature.json
View file @
4fca96b5
{
"id"
:
"docker-in-docker"
,
"version"
:
"2.
6
.0"
,
"version"
:
"2.
7
.0"
,
"name"
:
"Docker (Docker-in-Docker)"
,
"documentationURL"
:
"https://github.com/devcontainers/features/tree/main/src/docker-in-docker"
,
"description"
:
"Create child containers *inside* a container, independent from the host's docker instance. Installs Docker extension in the container along with needed CLIs."
,
...
...
src/docker-in-docker/install.sh
View file @
4fca96b5
...
...
@@ -362,8 +362,6 @@ EOF
tee
-a
/usr/local/share/docker-init.sh
>
/dev/null
\
<<
'
EOF
'
dockerd_start="AZURE_DNS_AUTO_DETECTION=
${
AZURE_DNS_AUTO_DETECTION
}
DOCKER_DEFAULT_ADDRESS_POOL=
${
DOCKER_DEFAULT_ADDRESS_POOL
}
$(
cat
<<
'
INNEREOF
'
# Stop dockerd and containerd in case they are already running
docker info > /dev/null 2>&1 && pkill dockerd && pkill containerd
# explicitly remove dockerd and containerd PID file to ensure that it can start properly if it was stopped uncleanly
find /run /var/run -iname 'docker*.pid' -delete || :
find /run /var/run -iname 'container*.pid' -delete || :
...
...
@@ -478,10 +476,12 @@ do
retry_count=`expr
$retry_count
+ 1`
done
if [ "
${
docker_ok
}
" != "true" ]; then
if [ "
${
docker_ok
}
" != "true" ]
&& [ "
${
retry_docker_start_count
}
" != "4" ]
; then
echo "(*) Failed to start docker, retrying..."
sudo_if pkill dockerd
sudo_if pkill containerd
set +e
sudo_if pkill dockerd
sudo_if pkill containerd
set -e
fi
retry_docker_start_count=`expr
$retry_docker_start_count
+ 1`
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment