Merge pull request #1975 from avsm/gc-aws

projects/aws: remove remaining files now that #1964 is merged

projects/README.md

@@ -15,7 +15,6 @@ If you want to create a project, please submit a pull request to create a new di
 - [Wireguard](wireguard/) cryptographic enforced container network separation
 - [OKernel](okernel/) intra-kernel protection using EPT (HPE)
 - [eBPF](ebpf/) iovisor eBPF tools
-- [AWS](aws/) AWS build support
 - [Swarmd](swarmd) Standalone swarmkit based orchestrator
 - [Landlock LSM](landlock/) programmatic access control
 - [Clear Containers](clear-containers/) Clear Containers image
@@ -28,3 +27,7 @@ If you want to create a project, please submit a pull request to create a new di
 ## Current projects not yet documented
 - VMWare support (VMWare)
 - ARM port and secure boot integration (ARM)
+
+## Completed projects
+
+- `aws/`: AWS support was merged into mainline in #1964.

projects/aws/alpine-aws/Dockerfile

@@ -1,13 +0,0 @@
-FROM alpine:3.5
-
-RUN \
-  apk update && apk upgrade && \
-  apk add --no-cache \
-    curl \
-    e2fsprogs \
-    jq \
-    python3 \
-    syslinux \
-  && true
-
-RUN pip3 install -U awscli

projects/aws/alpine-aws/Makefile

@@ -1,29 +0,0 @@
-.PHONY: tag push
-
-BASE=alpine:3.5
-IMAGE=alpine-aws
-
-default: push
-
-hash: Dockerfile
-	DOCKER_CONTENT_TRUST=1 docker pull $(BASE)
-	tar cf - $^ | docker build --no-cache -t $(IMAGE):build -
-	docker run --rm $(IMAGE):build sh -c '(pip list && cat /lib/apk/db/installed) | sha1sum' | sed 's/ .*//' > hash
-
-push: hash
-	docker pull mobylinux/$(IMAGE):$(shell cat hash) || \
-		(docker tag $(IMAGE):build mobylinux/$(IMAGE):$(shell cat hash) && \
-		 docker push mobylinux/$(IMAGE):$(shell cat hash))
-	docker rmi $(IMAGE):build
-	rm -f hash
-
-tag: hash
-	docker pull mobylinux/$(IMAGE):$(shell cat hash) || \
-		docker tag $(IMAGE):build mobylinux/$(IMAGE):$(shell cat hash)
-	docker rmi $(IMAGE):build
-	rm -f hash
-
-clean:
-	rm -f hash
-
-.DELETE_ON_ERROR:

projects/aws/cli/Dockerfile

@@ -1,11 +0,0 @@
-FROM alpine:3.5
-
-RUN \
-	mkdir -p /aws && \
-	apk -Uuv add groff less python py-pip && \
-	pip install awscli && \
-	apk --purge -v del py-pip && \
-	rm /var/cache/apk/*
-
-WORKDIR /aws
-ENTRYPOINT ["aws"]

projects/aws/cli/Makefile

@@ -1,29 +0,0 @@
-.PHONY: tag push
-
-BASE=alpine:3.5
-IMAGE=aws-cli
-
-default: push
-
-hash: Dockerfile
-	DOCKER_CONTENT_TRUST=1 docker pull $(BASE)
-	tar cf - $^ | docker build --no-cache -t $(IMAGE):build -
-	docker run --rm --entrypoint=/bin/sh $(IMAGE):build -c 'cat /Dockerfile /lib/apk/db/installed | sha1sum' | sed 's/ .*//' > hash
-
-push: hash
-	docker pull mobylinux/$(IMAGE):$(shell cat hash) || \
-		(docker tag $(IMAGE):build mobylinux/$(IMAGE):$(shell cat hash) && \
-		 docker push mobylinux/$(IMAGE):$(shell cat hash))
-	docker rmi $(IMAGE):build
-	rm -f hash
-
-tag: hash
-	docker pull mobylinux/$(IMAGE):$(shell cat hash) || \
-		docker tag $(IMAGE):build mobylinux/$(IMAGE):$(shell cat hash)
-	docker rmi $(IMAGE):build
-	rm -f hash
-
-clean:
-	rm -f hash
-
-.DELETE_ON_ERROR:

projects/aws/roadmap.md

@@ -1,14 +0,0 @@
-# AWS support
-
-The aim is provide good integration of Moby with Amazon AWS.
-
-Currently there is a container ([cli](cli/)) containing the AWS tools to manage AWS images and a Alpine based image ([alpine-aws](alpine-aws/)) which contains the integration services for AWS.
-
-## Roadmap
-
-**Near-term:**
-- Package AWS Integrations tools/cloudinit into a container image to be used in yaml files.
-- Add support for [building AMIs](https://github.com/docker/moby/pull/1119)
-
-**Mid-term:**
-- Regular CI jobs testing AWS integration