mirror of
https://github.com/moby/moby.git
synced 2022-11-09 12:21:53 -05:00
Optimized integration test case DockerSuite.TestBuildUsersAndGroups for #19425
Removed unnecessary RUN statements and combined some of the RUN statement into a single line. The runtime performance is seen as follows: pre-change: PASS: docker_cli_build_test.go:3826: DockerSuite.TestBuildUsersAndGroups 63.074s post-change: PASS: docker_cli_build_test.go:3826: DockerSuite.TestBuildUsersAndGroups 49.698s Signed-off-by: Anil Belur <askb23@gmail.com>
This commit is contained in:
parent
3d09842713
commit
deeb5c95e2
1 changed files with 5 additions and 8 deletions
|
@ -3837,21 +3837,18 @@ USER root
|
|||
RUN [ "$(id -G):$(id -Gn)" = '0 10:root wheel' ]
|
||||
|
||||
# Setup dockerio user and group
|
||||
RUN echo 'dockerio:x:1001:1001::/bin:/bin/false' >> /etc/passwd
|
||||
RUN echo 'dockerio:x:1001:' >> /etc/group
|
||||
RUN echo 'dockerio:x:1001:1001::/bin:/bin/false' >> /etc/passwd && \
|
||||
echo 'dockerio:x:1001:' >> /etc/group
|
||||
|
||||
# Make sure we can switch to our user and all the information is exactly as we expect it to be
|
||||
USER dockerio
|
||||
RUN id -G
|
||||
RUN id -Gn
|
||||
RUN [ "$(id -u):$(id -g)/$(id -un):$(id -gn)/$(id -G):$(id -Gn)" = '1001:1001/dockerio:dockerio/1001:dockerio' ]
|
||||
|
||||
# Switch back to root and double check that worked exactly as we might expect it to
|
||||
USER root
|
||||
RUN [ "$(id -u):$(id -g)/$(id -un):$(id -gn)/$(id -G):$(id -Gn)" = '0:0/root:root/0 10:root wheel' ]
|
||||
|
||||
# Add a "supplementary" group for our dockerio user
|
||||
RUN echo 'supplementary:x:1002:dockerio' >> /etc/group
|
||||
RUN [ "$(id -u):$(id -g)/$(id -un):$(id -gn)/$(id -G):$(id -Gn)" = '0:0/root:root/0 10:root wheel' ] && \
|
||||
# Add a "supplementary" group for our dockerio user \
|
||||
echo 'supplementary:x:1002:dockerio' >> /etc/group
|
||||
|
||||
# ... and then go verify that we get it like we expect
|
||||
USER dockerio
|
||||
|
|
Loading…
Reference in a new issue