From 8b6988d46d415427771101311d870c4f1d59fe63 Mon Sep 17 00:00:00 2001 From: "Tobias L. Maier" Date: Sun, 29 Apr 2018 07:02:09 +0200 Subject: [PATCH] Remove individual build directories --- 1.12/Dockerfile | 17 ----------------- 1.13/Dockerfile | 17 ----------------- 1.13/docker-compose.test.yml | 5 ----- 17.03/Dockerfile | 17 ----------------- 17.03/docker-compose.test.yml | 5 ----- 17.06/Dockerfile | 17 ----------------- 17.06/docker-compose.test.yml | 5 ----- 17.09/Dockerfile | 17 ----------------- 17.09/docker-compose.test.yml | 5 ----- 17.12/Dockerfile | 17 ----------------- 17.12/docker-compose.test.yml | 5 ----- 17/Dockerfile | 17 ----------------- 17/docker-compose.test.yml | 5 ----- 18.02/Dockerfile | 17 ----------------- 18.02/docker-compose.test.yml | 5 ----- 18/Dockerfile | 17 ----------------- 18/docker-compose.test.yml | 5 ----- latest/Dockerfile => Dockerfile | 0 ...-compose.test.yml => docker-compose.test.yml | 0 latest/docker-compose.test.yml | 5 ----- 20 files changed, 198 deletions(-) delete mode 100644 1.12/Dockerfile delete mode 100644 1.13/Dockerfile delete mode 100644 1.13/docker-compose.test.yml delete mode 100644 17.03/Dockerfile delete mode 100644 17.03/docker-compose.test.yml delete mode 100644 17.06/Dockerfile delete mode 100644 17.06/docker-compose.test.yml delete mode 100644 17.09/Dockerfile delete mode 100644 17.09/docker-compose.test.yml delete mode 100644 17.12/Dockerfile delete mode 100644 17.12/docker-compose.test.yml delete mode 100644 17/Dockerfile delete mode 100644 17/docker-compose.test.yml delete mode 100644 18.02/Dockerfile delete mode 100644 18.02/docker-compose.test.yml delete mode 100644 18/Dockerfile delete mode 100644 18/docker-compose.test.yml rename latest/Dockerfile => Dockerfile (100%) rename 1.12/docker-compose.test.yml => docker-compose.test.yml (100%) delete mode 100644 latest/docker-compose.test.yml diff --git a/1.12/Dockerfile b/1.12/Dockerfile deleted file mode 100644 index 61a9783..0000000 --- a/1.12/Dockerfile +++ /dev/null @@ -1,17 +0,0 @@ -ARG DOCKER_VERSION=1.12 -FROM docker:${DOCKER_VERSION} - -ARG COMPOSE_VERSION=1.8.* -ARG DOCKER_VERSION - -RUN apk add --no-cache py-pip -RUN pip install "docker-compose${COMPOSE_VERSION:+==}${COMPOSE_VERSION}" - -LABEL \ - org.opencontainers.image.authors="Tobias Maier " \ - org.opencontainers.image.description="This docker image installs docker-compose on top of the docker image." \ - org.opencontainers.image.licenses="MIT" \ - org.opencontainers.image.source="https://github.com/tmaier/docker-compose" \ - org.opencontainers.image.title="Docker Compose on docker base image" \ - org.opencontainers.image.vendor="BauCloud GmbH" \ - org.opencontainers.image.version="${DOCKER_VERSION} with docker-compose ${COMPOSE_VERSION}" diff --git a/1.13/Dockerfile b/1.13/Dockerfile deleted file mode 100644 index 24941d8..0000000 --- a/1.13/Dockerfile +++ /dev/null @@ -1,17 +0,0 @@ -ARG DOCKER_VERSION=1.13 -FROM docker:${DOCKER_VERSION} - -ARG COMPOSE_VERSION=1.10.* -ARG DOCKER_VERSION - -RUN apk add --no-cache py-pip -RUN pip install "docker-compose${COMPOSE_VERSION:+==}${COMPOSE_VERSION}" - -LABEL \ - org.opencontainers.image.authors="Tobias Maier " \ - org.opencontainers.image.description="This docker image installs docker-compose on top of the docker image." \ - org.opencontainers.image.licenses="MIT" \ - org.opencontainers.image.source="https://github.com/tmaier/docker-compose" \ - org.opencontainers.image.title="Docker Compose on docker base image" \ - org.opencontainers.image.vendor="BauCloud GmbH" \ - org.opencontainers.image.version="${DOCKER_VERSION} with docker-compose ${COMPOSE_VERSION}" diff --git a/1.13/docker-compose.test.yml b/1.13/docker-compose.test.yml deleted file mode 100644 index 476f460..0000000 --- a/1.13/docker-compose.test.yml +++ /dev/null @@ -1,5 +0,0 @@ -version: '3' -services: - sut: - image: ${IMAGE_NAME} - command: docker-compose version diff --git a/17.03/Dockerfile b/17.03/Dockerfile deleted file mode 100644 index eb4b367..0000000 --- a/17.03/Dockerfile +++ /dev/null @@ -1,17 +0,0 @@ -ARG DOCKER_VERSION=17.03 -FROM docker:${DOCKER_VERSION} - -ARG COMPOSE_VERSION=1.11.* -ARG DOCKER_VERSION - -RUN apk add --no-cache py-pip -RUN pip install "docker-compose${COMPOSE_VERSION:+==}${COMPOSE_VERSION}" - -LABEL \ - org.opencontainers.image.authors="Tobias Maier " \ - org.opencontainers.image.description="This docker image installs docker-compose on top of the docker image." \ - org.opencontainers.image.licenses="MIT" \ - org.opencontainers.image.source="https://github.com/tmaier/docker-compose" \ - org.opencontainers.image.title="Docker Compose on docker base image" \ - org.opencontainers.image.vendor="BauCloud GmbH" \ - org.opencontainers.image.version="${DOCKER_VERSION} with docker-compose ${COMPOSE_VERSION}" diff --git a/17.03/docker-compose.test.yml b/17.03/docker-compose.test.yml deleted file mode 100644 index 476f460..0000000 --- a/17.03/docker-compose.test.yml +++ /dev/null @@ -1,5 +0,0 @@ -version: '3' -services: - sut: - image: ${IMAGE_NAME} - command: docker-compose version diff --git a/17.06/Dockerfile b/17.06/Dockerfile deleted file mode 100644 index 3f19f7d..0000000 --- a/17.06/Dockerfile +++ /dev/null @@ -1,17 +0,0 @@ -ARG DOCKER_VERSION=17.06 -FROM docker:${DOCKER_VERSION} - -ARG COMPOSE_VERSION=1.15.* -ARG DOCKER_VERSION - -RUN apk add --no-cache py-pip -RUN pip install "docker-compose${COMPOSE_VERSION:+==}${COMPOSE_VERSION}" - -LABEL \ - org.opencontainers.image.authors="Tobias Maier " \ - org.opencontainers.image.description="This docker image installs docker-compose on top of the docker image." \ - org.opencontainers.image.licenses="MIT" \ - org.opencontainers.image.source="https://github.com/tmaier/docker-compose" \ - org.opencontainers.image.title="Docker Compose on docker base image" \ - org.opencontainers.image.vendor="BauCloud GmbH" \ - org.opencontainers.image.version="${DOCKER_VERSION} with docker-compose ${COMPOSE_VERSION}" diff --git a/17.06/docker-compose.test.yml b/17.06/docker-compose.test.yml deleted file mode 100644 index 476f460..0000000 --- a/17.06/docker-compose.test.yml +++ /dev/null @@ -1,5 +0,0 @@ -version: '3' -services: - sut: - image: ${IMAGE_NAME} - command: docker-compose version diff --git a/17.09/Dockerfile b/17.09/Dockerfile deleted file mode 100644 index 6ea2147..0000000 --- a/17.09/Dockerfile +++ /dev/null @@ -1,17 +0,0 @@ -ARG DOCKER_VERSION=17.09 -FROM docker:${DOCKER_VERSION} - -ARG COMPOSE_VERSION=1.16.* -ARG DOCKER_VERSION - -RUN apk add --no-cache py-pip -RUN pip install "docker-compose${COMPOSE_VERSION:+==}${COMPOSE_VERSION}" - -LABEL \ - org.opencontainers.image.authors="Tobias Maier " \ - org.opencontainers.image.description="This docker image installs docker-compose on top of the docker image." \ - org.opencontainers.image.licenses="MIT" \ - org.opencontainers.image.source="https://github.com/tmaier/docker-compose" \ - org.opencontainers.image.title="Docker Compose on docker base image" \ - org.opencontainers.image.vendor="BauCloud GmbH" \ - org.opencontainers.image.version="${DOCKER_VERSION} with docker-compose ${COMPOSE_VERSION}" diff --git a/17.09/docker-compose.test.yml b/17.09/docker-compose.test.yml deleted file mode 100644 index 476f460..0000000 --- a/17.09/docker-compose.test.yml +++ /dev/null @@ -1,5 +0,0 @@ -version: '3' -services: - sut: - image: ${IMAGE_NAME} - command: docker-compose version diff --git a/17.12/Dockerfile b/17.12/Dockerfile deleted file mode 100644 index 397eded..0000000 --- a/17.12/Dockerfile +++ /dev/null @@ -1,17 +0,0 @@ -ARG DOCKER_VERSION=17.12 -FROM docker:${DOCKER_VERSION} - -ARG COMPOSE_VERSION=1.18.* -ARG DOCKER_VERSION - -RUN apk add --no-cache py-pip -RUN pip install "docker-compose${COMPOSE_VERSION:+==}${COMPOSE_VERSION}" - -LABEL \ - org.opencontainers.image.authors="Tobias Maier " \ - org.opencontainers.image.description="This docker image installs docker-compose on top of the docker image." \ - org.opencontainers.image.licenses="MIT" \ - org.opencontainers.image.source="https://github.com/tmaier/docker-compose" \ - org.opencontainers.image.title="Docker Compose on docker base image" \ - org.opencontainers.image.vendor="BauCloud GmbH" \ - org.opencontainers.image.version="${DOCKER_VERSION} with docker-compose ${COMPOSE_VERSION}" diff --git a/17.12/docker-compose.test.yml b/17.12/docker-compose.test.yml deleted file mode 100644 index 476f460..0000000 --- a/17.12/docker-compose.test.yml +++ /dev/null @@ -1,5 +0,0 @@ -version: '3' -services: - sut: - image: ${IMAGE_NAME} - command: docker-compose version diff --git a/17/Dockerfile b/17/Dockerfile deleted file mode 100644 index af07e4b..0000000 --- a/17/Dockerfile +++ /dev/null @@ -1,17 +0,0 @@ -ARG DOCKER_VERSION=17 -FROM docker:${DOCKER_VERSION} - -ARG COMPOSE_VERSION=1.18.* -ARG DOCKER_VERSION - -RUN apk add --no-cache py-pip -RUN pip install "docker-compose${COMPOSE_VERSION:+==}${COMPOSE_VERSION}" - -LABEL \ - org.opencontainers.image.authors="Tobias Maier " \ - org.opencontainers.image.description="This docker image installs docker-compose on top of the docker image." \ - org.opencontainers.image.licenses="MIT" \ - org.opencontainers.image.source="https://github.com/tmaier/docker-compose" \ - org.opencontainers.image.title="Docker Compose on docker base image" \ - org.opencontainers.image.vendor="BauCloud GmbH" \ - org.opencontainers.image.version="${DOCKER_VERSION} with docker-compose ${COMPOSE_VERSION}" diff --git a/17/docker-compose.test.yml b/17/docker-compose.test.yml deleted file mode 100644 index 476f460..0000000 --- a/17/docker-compose.test.yml +++ /dev/null @@ -1,5 +0,0 @@ -version: '3' -services: - sut: - image: ${IMAGE_NAME} - command: docker-compose version diff --git a/18.02/Dockerfile b/18.02/Dockerfile deleted file mode 100644 index d75ac38..0000000 --- a/18.02/Dockerfile +++ /dev/null @@ -1,17 +0,0 @@ -ARG DOCKER_VERSION=18.02 -FROM docker:${DOCKER_VERSION} - -ARG COMPOSE_VERSION=1.19.* -ARG DOCKER_VERSION - -RUN apk add --no-cache py-pip -RUN pip install "docker-compose${COMPOSE_VERSION:+==}${COMPOSE_VERSION}" - -LABEL \ - org.opencontainers.image.authors="Tobias Maier " \ - org.opencontainers.image.description="This docker image installs docker-compose on top of the docker image." \ - org.opencontainers.image.licenses="MIT" \ - org.opencontainers.image.source="https://github.com/tmaier/docker-compose" \ - org.opencontainers.image.title="Docker Compose on docker base image" \ - org.opencontainers.image.vendor="BauCloud GmbH" \ - org.opencontainers.image.version="${DOCKER_VERSION} with docker-compose ${COMPOSE_VERSION}" diff --git a/18.02/docker-compose.test.yml b/18.02/docker-compose.test.yml deleted file mode 100644 index 476f460..0000000 --- a/18.02/docker-compose.test.yml +++ /dev/null @@ -1,5 +0,0 @@ -version: '3' -services: - sut: - image: ${IMAGE_NAME} - command: docker-compose version diff --git a/18/Dockerfile b/18/Dockerfile deleted file mode 100644 index db02c87..0000000 --- a/18/Dockerfile +++ /dev/null @@ -1,17 +0,0 @@ -ARG DOCKER_VERSION=18 -FROM docker:${DOCKER_VERSION} - -ARG COMPOSE_VERSION=1.19.* -ARG DOCKER_VERSION - -RUN apk add --no-cache py-pip -RUN pip install "docker-compose${COMPOSE_VERSION:+==}${COMPOSE_VERSION}" - -LABEL \ - org.opencontainers.image.authors="Tobias Maier " \ - org.opencontainers.image.description="This docker image installs docker-compose on top of the docker image." \ - org.opencontainers.image.licenses="MIT" \ - org.opencontainers.image.source="https://github.com/tmaier/docker-compose" \ - org.opencontainers.image.title="Docker Compose on docker base image" \ - org.opencontainers.image.vendor="BauCloud GmbH" \ - org.opencontainers.image.version="${DOCKER_VERSION} with docker-compose ${COMPOSE_VERSION}" diff --git a/18/docker-compose.test.yml b/18/docker-compose.test.yml deleted file mode 100644 index 476f460..0000000 --- a/18/docker-compose.test.yml +++ /dev/null @@ -1,5 +0,0 @@ -version: '3' -services: - sut: - image: ${IMAGE_NAME} - command: docker-compose version diff --git a/latest/Dockerfile b/Dockerfile similarity index 100% rename from latest/Dockerfile rename to Dockerfile diff --git a/1.12/docker-compose.test.yml b/docker-compose.test.yml similarity index 100% rename from 1.12/docker-compose.test.yml rename to docker-compose.test.yml diff --git a/latest/docker-compose.test.yml b/latest/docker-compose.test.yml deleted file mode 100644 index 476f460..0000000 --- a/latest/docker-compose.test.yml +++ /dev/null @@ -1,5 +0,0 @@ -version: '3' -services: - sut: - image: ${IMAGE_NAME} - command: docker-compose version