Skip to content

Commit 6b45257

Browse files
committed
comments purged, docker make experimental detailed
1 parent 6d3516e commit 6b45257

File tree

2 files changed

+1
-18
lines changed

2 files changed

+1
-18
lines changed

.circleci/config.yml

-17
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,6 @@ jobs:
3535
TAG=docker-build-0.2.$CIRCLE_BUILD_NUM
3636
time docker build -t lotharschulz/hellogo:$TAG .
3737
docker images
38-
# docker login -u $DOCKERHUB_USER -p $DOCKERHUB_PASSWORD
3938
echo "$DOCKERHUB_PASSWORD" | docker login --username $DOCKERHUB_USER --password-stdin
4039
time docker push lotharschulz/hellogo:$TAG
4140
docker rmi -f $(docker images -q)
@@ -55,7 +54,6 @@ jobs:
5554
DOCKER_IMAGE=$IMG VERSION=$TAG time make build.docker
5655
echo "docker images \n"
5756
docker images
58-
# docker login -u $DOCKERHUB_USER -p $DOCKERHUB_PASSWORD
5957
echo "$DOCKERHUB_PASSWORD" | docker login --username $DOCKERHUB_USER --password-stdin
6058
echo "docker push $IMG:$TAG \n"
6159
time docker push $IMG:$TAG
@@ -78,7 +76,6 @@ jobs:
7876
DOCKER_IMAGE=$IMG VERSION=$TAG time make build.docker-cache
7977
echo "docker images \n"
8078
docker images
81-
# docker login -u $DOCKERHUB_USER -p $DOCKERHUB_PASSWORD
8279
echo "$DOCKERHUB_PASSWORD" | docker login --username $DOCKERHUB_USER --password-stdin
8380
echo "docker push $IMG:$TAG \n"
8481
time docker push $IMG:$TAG
@@ -101,7 +98,6 @@ jobs:
10198
echo "DOCKER_IMAGE=$IMG VERSION=$TAG time make build.dockerbuilder \n"
10299
DOCKER_IMAGE=$IMG VERSION=$TAG time make build.dockerbuilder
103100
docker images
104-
# docker login -u $DOCKERHUB_USER -p $DOCKERHUB_PASSWORD
105101
echo "$DOCKERHUB_PASSWORD" | docker login --username $DOCKERHUB_USER --password-stdin
106102
echo "docker push $IMG:$TAG \n"
107103
time docker push $IMG:$TAG
@@ -123,7 +119,6 @@ jobs:
123119
echo "DOCKER_IMAGE=$IMG VERSION=$TAG time make build.dockerbuilder-cache \n"
124120
DOCKER_IMAGE=$IMG VERSION=$TAG time make build.dockerbuilder-cache
125121
docker images
126-
# docker login -u $DOCKERHUB_USER -p $DOCKERHUB_PASSWORD
127122
echo "$DOCKERHUB_PASSWORD" | docker login --username $DOCKERHUB_USER --password-stdin
128123
echo "docker push $IMG:$TAG \n"
129124
time docker push $IMG:$TAG
@@ -140,7 +135,6 @@ jobs:
140135
echo "DOCKER_IMAGE=$IMG VERSION=$TAG time make build.dockerbuilder-nocache \n"
141136
DOCKER_IMAGE=$IMG VERSION=$TAG time make build.dockerbuilder-nocache
142137
docker images
143-
# docker login -u $DOCKERHUB_USER -p $DOCKERHUB_PASSWORD
144138
echo "$DOCKERHUB_PASSWORD" | docker login --username $DOCKERHUB_USER --password-stdin
145139
echo "docker push $IMG:$TAG \n"
146140
time docker push $IMG:$TAG
@@ -164,7 +158,6 @@ jobs:
164158
echo "DOCKER_IMAGE=$IMG VERSION=$TAG time make build.dockerbuilder-squash \n"
165159
DOCKER_IMAGE=$IMG VERSION=$TAG time make build.dockerbuilder-squash
166160
docker images
167-
# docker login -u $DOCKERHUB_USER -p $DOCKERHUB_PASSWORD
168161
echo "$DOCKERHUB_PASSWORD" | docker login --username $DOCKERHUB_USER --password-stdin
169162
echo "docker push $IMG:$TAG \n"
170163
time docker push $IMG:$TAG
@@ -186,7 +179,6 @@ jobs:
186179
echo "DOCKER_IMAGE=$IMG VERSION=$TAG time make build.dockerbuilder-compress \n"
187180
DOCKER_IMAGE=$IMG VERSION=$TAG time make build.dockerbuilder-compress
188181
docker images
189-
# docker login -u $DOCKERHUB_USER -p $DOCKERHUB_PASSWORD
190182
echo "$DOCKERHUB_PASSWORD" | docker login --username $DOCKERHUB_USER --password-stdin
191183
echo "docker push $IMG:$TAG \n"
192184
time docker push $IMG:$TAG
@@ -209,7 +201,6 @@ jobs:
209201
echo "DOCKER_IMAGE=$IMG VERSION=$TAG time make build.dockeralpine \n"
210202
DOCKER_IMAGE=$IMG VERSION=$TAG time make build.dockeralpine
211203
docker images
212-
# docker login -u $DOCKERHUB_USER -p $DOCKERHUB_PASSWORD
213204
echo "$DOCKERHUB_PASSWORD" | docker login --username $DOCKERHUB_USER --password-stdin
214205
echo "docker push $IMG:$TAG \n"
215206
time docker push $IMG:$TAG
@@ -231,7 +222,6 @@ jobs:
231222
echo "DOCKER_IMAGE=$IMG VERSION=$TAG time make build.dockeralpine-cache \n"
232223
DOCKER_IMAGE=$IMG VERSION=$TAG time make build.dockeralpine-cache
233224
docker images
234-
# docker login -u $DOCKERHUB_USER -p $DOCKERHUB_PASSWORD
235225
echo "$DOCKERHUB_PASSWORD" | docker login --username $DOCKERHUB_USER --password-stdin
236226
echo "docker push $IMG:$TAG \n"
237227
time docker push $IMG:$TAG
@@ -248,7 +238,6 @@ jobs:
248238
echo "DOCKER_IMAGE=$IMG VERSION=$TAG time make build.dockeralpine-nocache \n"
249239
DOCKER_IMAGE=$IMG VERSION=$TAG time make build.dockeralpine-nocache
250240
docker images
251-
# docker login -u $DOCKERHUB_USER -p $DOCKERHUB_PASSWORD
252241
echo "$DOCKERHUB_PASSWORD" | docker login --username $DOCKERHUB_USER --password-stdin
253242
echo "docker push $IMG:$TAG \n"
254243
time docker push $IMG:$TAG
@@ -270,7 +259,6 @@ jobs:
270259
echo "DOCKER_IMAGE=$IMG VERSION=$TAG time make build.dockeralpine-squash \n"
271260
DOCKER_IMAGE=$IMG VERSION=$TAG time make build.dockeralpine-squash
272261
docker images
273-
# docker login -u $DOCKERHUB_USER -p $DOCKERHUB_PASSWORD
274262
echo "$DOCKERHUB_PASSWORD" | docker login --username $DOCKERHUB_USER --password-stdin
275263
echo "docker push $IMG:$TAG \n"
276264
time docker push $IMG:$TAG
@@ -292,7 +280,6 @@ jobs:
292280
echo "DOCKER_IMAGE=$IMG VERSION=$TAG time make build.dockeralpine-compress \n"
293281
DOCKER_IMAGE=$IMG VERSION=$TAG time make build.dockeralpine-compress
294282
docker images
295-
# docker login -u $DOCKERHUB_USER -p $DOCKERHUB_PASSWORD
296283
echo "$DOCKERHUB_PASSWORD" | docker login --username $DOCKERHUB_USER --password-stdin
297284
echo "docker push $IMG:$TAG \n"
298285
time docker push $IMG:$TAG
@@ -310,7 +297,6 @@ jobs:
310297
echo "DOCKER_IMAGE=$IMG VERSION=$TAG time make build.docker-min \n"
311298
DOCKER_IMAGE=$IMG VERSION=$TAG time make build.docker-min
312299
docker images
313-
# docker login -u $DOCKERHUB_USER -p $DOCKERHUB_PASSWORD
314300
echo "$DOCKERHUB_PASSWORD" | docker login --username $DOCKERHUB_USER --password-stdin
315301
echo "docker push $IMG:$TAG \n"
316302
time docker push $IMG:$TAG
@@ -327,7 +313,6 @@ jobs:
327313
echo "DOCKER_IMAGE=$IMG VERSION=$TAG time make build.docker-min-nocache \n"
328314
DOCKER_IMAGE=$IMG VERSION=$TAG time make build.docker-min-nocache
329315
docker images
330-
# docker login -u $DOCKERHUB_USER -p $DOCKERHUB_PASSWORD
331316
echo "$DOCKERHUB_PASSWORD" | docker login --username $DOCKERHUB_USER --password-stdin
332317
echo "docker push $IMG:$TAG \n"
333318
time docker push $IMG:$TAG
@@ -344,7 +329,6 @@ jobs:
344329
echo "DOCKER_IMAGE=$IMG VERSION=$TAG time make build.docker-min-squash \n"
345330
DOCKER_IMAGE=$IMG VERSION=$TAG time make build.docker-min-squash
346331
docker images
347-
# docker login -u $DOCKERHUB_USER -p $DOCKERHUB_PASSWORD
348332
echo "$DOCKERHUB_PASSWORD" | docker login --username $DOCKERHUB_USER --password-stdin
349333
echo "docker push $IMG:$TAG \n"
350334
time docker push $IMG:$TAG
@@ -361,7 +345,6 @@ jobs:
361345
echo "DOCKER_IMAGE=$IMG VERSION=$TAG time make build.docker-min-compress \n"
362346
DOCKER_IMAGE=$IMG VERSION=$TAG time make build.docker-min-compress
363347
docker images
364-
# docker login -u $DOCKERHUB_USER -p $DOCKERHUB_PASSWORD
365348
echo "$DOCKERHUB_PASSWORD" | docker login --username $DOCKERHUB_USER --password-stdin
366349
echo "docker push $IMG:$TAG \n"
367350
time docker push $IMG:$TAG

README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ $ sudo service docker restart
6868
$ docker version -f '{{.Server.Experimental}}'
6969
true
7070
```
71-
_Docker on Mac OS offers to set this via UI as well. That would be Preferences->Daemon->Advanced._
71+
_Docker on Mac OS offers to set the experimental functions via UI as well. That would be Preferences->Daemon->Advanced._
7272

7373
#### blog post
7474
[let’s go build a minimal docker image](https://www.lotharschulz.info/2018/10/01/lets-go-build-a-minimal-docker-image/)

0 commit comments

Comments
 (0)