From 4b7e0e11a840412275bd38933a49ed251208dfd6 Mon Sep 17 00:00:00 2001 From: Anil Madhavapeddy Date: Tue, 6 Jun 2017 20:56:39 +0100 Subject: [PATCH 1/2] projects/aws: remove remaining files now that #1964 is merged The AWS support has gone mainline so no need for the project anymore. Signed-off-by: Anil Madhavapeddy --- projects/aws/alpine-aws/Dockerfile | 13 ------------- projects/aws/alpine-aws/Makefile | 29 ----------------------------- projects/aws/cli/Dockerfile | 11 ----------- projects/aws/cli/Makefile | 29 ----------------------------- projects/aws/roadmap.md | 14 -------------- 5 files changed, 96 deletions(-) delete mode 100644 projects/aws/alpine-aws/Dockerfile delete mode 100644 projects/aws/alpine-aws/Makefile delete mode 100644 projects/aws/cli/Dockerfile delete mode 100644 projects/aws/cli/Makefile delete mode 100644 projects/aws/roadmap.md diff --git a/projects/aws/alpine-aws/Dockerfile b/projects/aws/alpine-aws/Dockerfile deleted file mode 100644 index 188089f87..000000000 --- a/projects/aws/alpine-aws/Dockerfile +++ /dev/null @@ -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 diff --git a/projects/aws/alpine-aws/Makefile b/projects/aws/alpine-aws/Makefile deleted file mode 100644 index 929a56863..000000000 --- a/projects/aws/alpine-aws/Makefile +++ /dev/null @@ -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: diff --git a/projects/aws/cli/Dockerfile b/projects/aws/cli/Dockerfile deleted file mode 100644 index 652342f50..000000000 --- a/projects/aws/cli/Dockerfile +++ /dev/null @@ -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"] diff --git a/projects/aws/cli/Makefile b/projects/aws/cli/Makefile deleted file mode 100644 index a449d5bc6..000000000 --- a/projects/aws/cli/Makefile +++ /dev/null @@ -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: diff --git a/projects/aws/roadmap.md b/projects/aws/roadmap.md deleted file mode 100644 index 7894d851b..000000000 --- a/projects/aws/roadmap.md +++ /dev/null @@ -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 From 5652987f63b447e3f0123cf7bb6706b85b9d0893 Mon Sep 17 00:00:00 2001 From: Anil Madhavapeddy Date: Tue, 6 Jun 2017 21:24:29 +0100 Subject: [PATCH 2/2] projects: mark aws as completed in a new section in README Signed-off-by: Anil Madhavapeddy --- projects/README.md | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/projects/README.md b/projects/README.md index 59f8435ca..7c965652a 100644 --- a/projects/README.md +++ b/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.