浏览代码

Sunset Classic Swarm image

Further deprecate the classic Swarm image, as classic (standalone,
not swarmkit) is deprecated.

Co-authored-by: Tianon Gravi <[email protected]>
Signed-off-by: Sebastiaan van Stijn <[email protected]>
Sebastiaan van Stijn 4 年之前
父节点
当前提交
e229d583fe
共有 4 个文件被更改,包括 5 次插入12 次删除
  1. 1 1
      README.md
  2. 4 8
      library/swarm
  3. 0 1
      test/README.md
  4. 0 2
      test/config.sh

+ 1 - 1
README.md

@@ -168,7 +168,7 @@ All official images should provide a consistent interface. A beginning user shou
 3.	If the image only contains the main executable and its linked libraries (ie no shell) then it is fine to use the executable as the `ENTRYPOINT`, since that is the only thing that can run:
 
 	```Dockerfile
-	ENTRYPOINT ["swarm"]
+	ENTRYPOINT ["fully-static-binary"]
 	CMD ["--help"]
 	```
 

+ 4 - 8
library/swarm

@@ -1,9 +1,5 @@
-Maintainers: Alexandre Beslic <[email protected]> (@abronan),
-             Andrea Luzzardi <[email protected]> (@aluzzardi),
-             Dong Chen <[email protected]> (@dongluochen),
-             Nishant Totla <[email protected]> (@nishanttotla),
-             Victor Vieux <[email protected]> (@vieux)
-GitRepo: https://github.com/docker/swarm-library-image.git
+# Classic Swarm has been archived and is no longer actively developed.
+# You may want to use the Swarm mode built into the Docker Engine instead, or another orchestration system.
 
-Tags: 1.2.9, latest
-GitCommit: a2a08d733833327354b5d3336ffbd19e4f369a2d
+Maintainers: Docker <[email protected]> (@docker)
+GitRepo: https://github.com/docker-archive/swarm-library-image.git

+ 0 - 1
test/README.md

@@ -195,7 +195,6 @@ Defines image+test combinations which shouldn't ever run (usually because they w
 globalExcludeTests+=(
 	# single-binary images
 	[hello-world_utc]=1
-	[swarm_utc]=1
 )
 ```
 

+ 0 - 2
test/config.sh

@@ -284,8 +284,6 @@ globalExcludeTests+=(
 	[nats-streaming_utc]=1
 	[nats_no-hard-coded-passwords]=1
 	[nats_utc]=1
-	[swarm_no-hard-coded-passwords]=1
-	[swarm_utc]=1
 	[traefik_no-hard-coded-passwords]=1
 	[traefik_utc]=1