Browse code

Removed root@... PS1 from in-container root prompts, retaining #.

Signed-off-by: Brett Randall <javabrett@gmail.com>

Brett Randall authored on 2018/02/20 09:28:54
Showing 2 changed files
... ...
@@ -131,7 +131,7 @@ can take over 15 minutes to complete.
131 131
    Successfully built 3d872560918e
132 132
    Successfully tagged docker-dev:dry-run-test
133 133
    docker run --rm -i --privileged -e BUILDFLAGS -e KEEPBUNDLE -e DOCKER_BUILD_GOGC -e DOCKER_BUILD_PKGS -e DOCKER_CLIENTONLY -e DOCKER_DEBUG -e DOCKER_EXPERIMENTAL -e DOCKER_GITCOMMIT -e DOCKER_GRAPHDRIVER=devicemapper -e DOCKER_INCREMENTAL_BINARY -e DOCKER_REMAP_ROOT -e DOCKER_STORAGE_OPTS -e DOCKER_USERLANDPROXY -e TESTDIRS -e TESTFLAGS -e TIMEOUT -v "home/ubuntu/repos/docker/bundles:/go/src/github.com/docker/docker/bundles" -t "docker-dev:dry-run-test" bash
134
-   root@f31fa223770f:/go/src/github.com/docker/docker#
134
+   #
135 135
    ```
136 136
 
137 137
    At this point, your prompt reflects the container's BASH shell.
... ...
@@ -146,7 +146,7 @@ can take over 15 minutes to complete.
146 146
 6. Make a `dockerd` binary.
147 147
 
148 148
    ```none
149
-   root@a8b2885ab900:/go/src/github.com/docker/docker# hack/make.sh binary
149
+   # hack/make.sh binary
150 150
    Removing bundles/
151 151
 
152 152
    ---> Making bundle: binary (in bundles/binary)
... ...
@@ -160,13 +160,13 @@ can take over 15 minutes to complete.
160 160
    `/usr/local/bin/` directory.
161 161
 
162 162
    ```none
163
-   root@a8b2885ab900:/go/src/github.com/docker/docker# make install
163
+   # make install
164 164
    ```
165 165
 
166 166
 8. Start the Engine daemon running in the background.
167 167
 
168 168
    ```none
169
-   root@a8b2885ab900:/go/src/github.com/docker/docker# dockerd -D &
169
+   # dockerd -D &
170 170
    ...output snipped...
171 171
    DEBU[0001] Registering POST, /networks/{id:.*}/connect
172 172
    DEBU[0001] Registering POST, /networks/{id:.*}/disconnect
... ...
@@ -252,13 +252,13 @@ can take over 15 minutes to complete.
252 252
 10. Run the `hello-world` image.
253 253
 
254 254
     ```none
255
-    root@5f8630b873fe:/go/src/github.com/docker/docker# docker run hello-world
255
+    # docker run hello-world
256 256
     ```
257 257
 
258 258
 11. List the image you just downloaded.
259 259
 
260 260
     ```none
261
-    root@5f8630b873fe:/go/src/github.com/docker/docker# docker images
261
+    # docker images
262 262
 	REPOSITORY   TAG     IMAGE ID      CREATED        SIZE
263 263
 	hello-world  latest  c54a2cc56cbb  3 months ago   1.85 kB
264 264
     ```
... ...
@@ -347,7 +347,7 @@ example, you'll edit the help for the `attach` subcommand.
347 347
 10. To view your change, run the `dockerd --help` command in the docker development container shell.
348 348
 
349 349
    ```bash
350
-   root@b0cb4f22715d:/go/src/github.com/docker/docker# dockerd --help
350
+   # dockerd --help
351 351
 
352 352
    Usage:        dockerd COMMAND
353 353
 
... ...
@@ -117,13 +117,13 @@ Try this now.
117 117
 3.  Run the unit tests using the `hack/test/unit` script.
118 118
 
119 119
     ```bash
120
-    root@5f8630b873fe:/go/src/github.com/docker/docker# hack/test/unit
120
+    # hack/test/unit
121 121
     ```
122 122
 
123 123
 4.  Run the tests using the `hack/make.sh` script.
124 124
 
125 125
     ```bash
126
-    root@5f8630b873fe:/go/src/github.com/docker/docker# hack/make.sh dynbinary binary cross test-integration test-docker-py
126
+    # hack/make.sh dynbinary binary cross test-integration test-docker-py
127 127
     ```
128 128
 
129 129
     The tests run just as they did within your local host.
... ...
@@ -132,7 +132,7 @@ Try this now.
132 132
     just the integration tests:
133 133
 
134 134
     ```bash
135
-    root@5f8630b873fe:/go/src/github.com/docker/docker# hack/make.sh dynbinary binary cross test-integration
135
+    # hack/make.sh dynbinary binary cross test-integration
136 136
     ```
137 137
 
138 138
     Most test targets require that you build these precursor targets first:
... ...
@@ -180,7 +180,7 @@ $ TESTFLAGS='-check.f DockerSuite.TestBuild*' make test-integration
180 180
 To run the same test inside your Docker development container, you do this:
181 181
 
182 182
 ```bash
183
-root@5f8630b873fe:/go/src/github.com/docker/docker# TESTFLAGS='-check.f TestBuild*' hack/make.sh binary test-integration
183
+# TESTFLAGS='-check.f TestBuild*' hack/make.sh binary test-integration
184 184
 ```
185 185
 
186 186
 ## Test the Windows binary against a Linux daemon