Skip to content

Update node spec in Jenkinsfile and Docker config mount #8281

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 5 commits into from
Apr 15, 2021

Conversation

aiordache
Copy link
Contributor

Fix test setup

Signed-off-by: Anca Iordache <anca.iordache@docker.com>
Signed-off-by: Anca Iordache <anca.iordache@docker.com>
@aiordache aiordache changed the title Update node spec in Jenkinsfile Update node spec in Jenkinsfile and Docker config mount Apr 15, 2021
@aiordache aiordache requested a review from StefanScherer April 15, 2021 08:14
@aiordache aiordache force-pushed the Jenkins_update branch 2 times, most recently from cc1a0a0 to e6e3ad5 Compare April 15, 2021 10:18
Signed-off-by: Anca Iordache <anca.iordache@docker.com>
@aiordache aiordache force-pushed the Jenkins_update branch 2 times, most recently from c09e917 to 8f9f111 Compare April 15, 2021 11:56
Signed-off-by: Anca Iordache <anca.iordache@docker.com>
Signed-off-by: Anca Iordache <anca.iordache@docker.com>
@StefanScherer
Copy link
Member

I've verified that the config.json is valid now in the outer and the inner container:

ubuntu@ip-10-100-50-213:~$ docker ps
CONTAINER ID   IMAGE                                                                  COMMAND                  CREATED         STATUS         PORTS           NAMES
1366ac199d9f   dockerpinata/compose:debian-6ea24001fad37c8327bca6048e56aabcb27ad543   "tox -e py37 -- --ve…"   6 minutes ago   Up 6 minutes                   goofy_euler
dc7d4533187d   docker:19.03.13-dind                                                   "dockerd-entrypoint.…"   6 minutes ago   Up 6 minutes   2375-2376/tcp   compose-dind-19.03.13-18
64d69e0868f3   dockerpinata/compose:debian-6ea24001fad37c8327bca6048e56aabcb27ad543   "script/test/ci --ve…"   7 minutes ago   Up 7 minutes                   blissful_chatterjee
ubuntu@ip-10-100-50-213:~$ docker exec dc7d cat /root/.docker/config.json
{
	"auths": {
		"https://index.docker.io/v1/": {
			"auth": "redacted"
		}
	}
}ubuntu@ip-10-100-50-213:~$ docker exec 64d6 cat /root/.docker/config.json
{
	"auths": {
		"https://index.docker.io/v1/": {
			"auth": "redacted"
		}
	}
}ubuntu@ip-10-100-50-213:~$ docker exec 64d6 ls -l /root/.docker/config.json
-rw------- 1 1000 1000 139 Apr 15 12:19 /root/.docker/config.json
ubuntu@ip-10-100-50-213:~$ docker exec dc7d ls -l /root/.docker/config.json
-rw-r--r--    1 1000     1000           139 Apr 15 12:19 /root/.docker/config.json
ubuntu@ip-10-100-50-213:~$ 

@StefanScherer
Copy link
Member

A mount with -v /root/.docker/config.json:/root/.docker/config.json \ didn't work, the inner /root/.docker/config.json/ was then a folder, maybe because of the restricted file permissions of the Jenkins credential.

Copy link
Member

@StefanScherer StefanScherer left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM 🔍 🔬

Copy link
Collaborator

@ulyssessouza ulyssessouza left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@ulyssessouza ulyssessouza merged commit 853efbf into docker:master Apr 15, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants