aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--.travis.yml31
-rw-r--r--build/1.5/Dockerfile26
-rw-r--r--build/1.6/Dockerfile26
-rw-r--r--build/1.7/Dockerfile26
-rw-r--r--build/latest/Dockerfile8
-rw-r--r--build/release/Dockerfile (renamed from build/1.4/Dockerfile)13
-rw-r--r--default/1.5/Dockerfile26
-rw-r--r--default/1.6/Dockerfile26
-rw-r--r--default/1.7/Dockerfile26
-rw-r--r--default/latest/Dockerfile7
-rw-r--r--default/release/Dockerfile (renamed from default/1.4/Dockerfile)10
11 files changed, 26 insertions, 199 deletions
diff --git a/.travis.yml b/.travis.yml
index 1801f99..ba86b5c 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -10,24 +10,19 @@ notifications:
- "info@valentineus.link"
env:
- - "IMAGE=./default/latest"
- - "IMAGE=./default/1.7"
- - "IMAGE=./default/1.6"
- - "IMAGE=./default/1.5"
- - "IMAGE=./default/1.4"
- - "IMAGE=./build/latest"
- - "IMAGE=./build/1.7"
- - "IMAGE=./build/1.6"
- - "IMAGE=./build/1.5"
- - "IMAGE=./build/1.4"
+ - TAG="latest" RELEASE="latest" DIRECTORY="./default/latest"
+ - TAG="1.7" RELEASE="1.7" DIRECTORY="./default/release"
+ - TAG="1.6" RELEASE="1.6" DIRECTORY="./default/release"
+ - TAG="1.5" RELEASE="1.5" DIRECTORY="./default/release"
+ - TAG="1.4" RELEASE="1.4" DIRECTORY="./default/release"
+ - TAG="build" RELEASE="latest" DIRECTORY="./build/latest"
+ - TAG="build-1.7" RELEASE="1.7" DIRECTORY="./build/release"
+ - TAG="build-1.6" RELEASE="1.6" DIRECTORY="./build/release"
+ - TAG="build-1.5" RELEASE="1.5" DIRECTORY="./build/release"
+ - TAG="build-1.4" RELEASE="1.4" DIRECTORY="./build/release"
script:
- - docker build --tag "${TRAVIS_REPO_SLUG}" "${IMAGE}"
+ - docker build --build-arg RELEASE="${RELEASE}" --tag "${TAG}" "${DIRECTORY}"
-jobs:
- include:
- - stage: deploy
- deploy:
- provider: script
- script:
- - "curl -H 'Content-Type: application/json' --data '{\"build\":true}' -X POST 'https://registry.hub.docker.com/u/valentineus/meteor/trigger/${TOKEN}/'" \ No newline at end of file
+after_success:
+ - "curl -H 'Content-Type: application/json' --data '{\"docker_tag\":\"${TAG}\"}' -X POST 'https://registry.hub.docker.com/u/valentineus/meteor/trigger/${TOKEN}/'"
diff --git a/build/1.5/Dockerfile b/build/1.5/Dockerfile
deleted file mode 100644
index c699f2b..0000000
--- a/build/1.5/Dockerfile
+++ /dev/null
@@ -1,26 +0,0 @@
-FROM ubuntu:rolling
-LABEL maintainer="info@valentineus.link"
-
-ENV METEOR_ALLOW_SUPERUSER="true"
-ENV RELEASE="1.5"
-WORKDIR "/workspace"
-
-RUN set -ex \
- && apt-get update \
- && apt-get --no-install-recommends --no-install-suggests --yes install \
- build-essential \
- ca-certificates \
- curl \
- git \
- openssl \
- && curl https://install.meteor.com | sed 's/^RELEASE=.*/RELEASE=${RELEASE}/g' | sh \
- && apt-get --purge --yes autoremove \
- && apt-get clean \
- && find /tmp -type f -exec rm {} \; \
- && find /var/cache -type f -exec rm {} \; \
- && find /var/lib/apt/lists -type f -exec rm {} \; \
- && find /var/log -type f -exec rm {} \; \
- && find /var/tmp -type f -exec rm {} \;
-
-EXPOSE 3000
-CMD [ "/usr/local/bin/meteor", "run" ] \ No newline at end of file
diff --git a/build/1.6/Dockerfile b/build/1.6/Dockerfile
deleted file mode 100644
index 7a7fd8f..0000000
--- a/build/1.6/Dockerfile
+++ /dev/null
@@ -1,26 +0,0 @@
-FROM ubuntu:rolling
-LABEL maintainer="info@valentineus.link"
-
-ENV METEOR_ALLOW_SUPERUSER="true"
-ENV RELEASE="1.6"
-WORKDIR "/workspace"
-
-RUN set -ex \
- && apt-get update \
- && apt-get --no-install-recommends --no-install-suggests --yes install \
- build-essential \
- ca-certificates \
- curl \
- git \
- openssl \
- && curl https://install.meteor.com | sed 's/^RELEASE=.*/RELEASE=${RELEASE}/g' | sh \
- && apt-get --purge --yes autoremove \
- && apt-get clean \
- && find /tmp -type f -exec rm {} \; \
- && find /var/cache -type f -exec rm {} \; \
- && find /var/lib/apt/lists -type f -exec rm {} \; \
- && find /var/log -type f -exec rm {} \; \
- && find /var/tmp -type f -exec rm {} \;
-
-EXPOSE 3000
-CMD [ "/usr/local/bin/meteor", "run" ] \ No newline at end of file
diff --git a/build/1.7/Dockerfile b/build/1.7/Dockerfile
deleted file mode 100644
index f0e4681..0000000
--- a/build/1.7/Dockerfile
+++ /dev/null
@@ -1,26 +0,0 @@
-FROM ubuntu:rolling
-LABEL maintainer="info@valentineus.link"
-
-ENV METEOR_ALLOW_SUPERUSER="true"
-ENV RELEASE="1.7"
-WORKDIR "/workspace"
-
-RUN set -ex \
- && apt-get update \
- && apt-get --no-install-recommends --no-install-suggests --yes install \
- build-essential \
- ca-certificates \
- curl \
- git \
- openssl \
- && curl https://install.meteor.com | sed 's/^RELEASE=.*/RELEASE=${RELEASE}/g' | sh \
- && apt-get --purge --yes autoremove \
- && apt-get clean \
- && find /tmp -type f -exec rm {} \; \
- && find /var/cache -type f -exec rm {} \; \
- && find /var/lib/apt/lists -type f -exec rm {} \; \
- && find /var/log -type f -exec rm {} \; \
- && find /var/tmp -type f -exec rm {} \;
-
-EXPOSE 3000
-CMD [ "/usr/local/bin/meteor", "run" ] \ No newline at end of file
diff --git a/build/latest/Dockerfile b/build/latest/Dockerfile
index 20529d1..733fc6b 100644
--- a/build/latest/Dockerfile
+++ b/build/latest/Dockerfile
@@ -2,16 +2,11 @@ FROM ubuntu:rolling
LABEL maintainer="info@valentineus.link"
ENV METEOR_ALLOW_SUPERUSER="true"
-WORKDIR "/workspace"
RUN set -ex \
&& apt-get update \
&& apt-get --no-install-recommends --no-install-suggests --yes install \
- build-essential \
- ca-certificates \
- curl \
- git \
- openssl \
+ build-essential ca-certificates curl git openssl \
&& curl https://install.meteor.com | sh \
&& apt-get --purge --yes autoremove \
&& apt-get clean \
@@ -22,4 +17,5 @@ RUN set -ex \
&& find /var/tmp -type f -exec rm {} \;
EXPOSE 3000
+WORKDIR "/workspace"
CMD [ "/usr/local/bin/meteor", "run" ] \ No newline at end of file
diff --git a/build/1.4/Dockerfile b/build/release/Dockerfile
index bf01f2f..67221d6 100644
--- a/build/1.4/Dockerfile
+++ b/build/release/Dockerfile
@@ -2,18 +2,14 @@ FROM ubuntu:rolling
LABEL maintainer="info@valentineus.link"
ENV METEOR_ALLOW_SUPERUSER="true"
-ENV RELEASE="1.4"
-WORKDIR "/workspace"
+
+ARG release
RUN set -ex \
&& apt-get update \
&& apt-get --no-install-recommends --no-install-suggests --yes install \
- build-essential \
- ca-certificates \
- curl \
- git \
- openssl \
- && curl https://install.meteor.com | sed 's/^RELEASE=.*/RELEASE=${RELEASE}/g' | sh \
+ build-essential ca-certificates curl git openssl \
+ && curl https://install.meteor.com | sed 's/^RELEASE=.*/RELEASE=${release}/g' | sh \
&& apt-get --purge --yes autoremove \
&& apt-get clean \
&& find /tmp -type f -exec rm {} \; \
@@ -23,4 +19,5 @@ RUN set -ex \
&& find /var/tmp -type f -exec rm {} \;
EXPOSE 3000
+WORKDIR "/workspace"
CMD [ "/usr/local/bin/meteor", "run" ] \ No newline at end of file
diff --git a/default/1.5/Dockerfile b/default/1.5/Dockerfile
deleted file mode 100644
index a4e61bd..0000000
--- a/default/1.5/Dockerfile
+++ /dev/null
@@ -1,26 +0,0 @@
-FROM ubuntu:rolling
-LABEL maintainer="info@valentineus.link"
-
-ENV METEOR_ALLOW_SUPERUSER="true"
-ENV RELEASE="1.5"
-WORKDIR "/workspace"
-
-RUN set -ex \
- && apt-get update \
- && apt-get --no-install-recommends --no-install-suggests --yes install \
- ca-certificates \
- curl \
- git \
- openssl \
- && curl https://install.meteor.com | sed 's/^RELEASE=.*/RELEASE=${RELEASE}/g' | sh \
- && apt-get --purge --yes remove curl \
- && apt-get --purge --yes autoremove \
- && apt-get clean \
- && find /tmp -type f -exec rm {} \; \
- && find /var/cache -type f -exec rm {} \; \
- && find /var/lib/apt/lists -type f -exec rm {} \; \
- && find /var/log -type f -exec rm {} \; \
- && find /var/tmp -type f -exec rm {} \;
-
-EXPOSE 3000
-CMD [ "/usr/local/bin/meteor", "run" ] \ No newline at end of file
diff --git a/default/1.6/Dockerfile b/default/1.6/Dockerfile
deleted file mode 100644
index 256863e..0000000
--- a/default/1.6/Dockerfile
+++ /dev/null
@@ -1,26 +0,0 @@
-FROM ubuntu:rolling
-LABEL maintainer="info@valentineus.link"
-
-ENV METEOR_ALLOW_SUPERUSER="true"
-ENV RELEASE="1.6"
-WORKDIR "/workspace"
-
-RUN set -ex \
- && apt-get update \
- && apt-get --no-install-recommends --no-install-suggests --yes install \
- ca-certificates \
- curl \
- git \
- openssl \
- && curl https://install.meteor.com | sed 's/^RELEASE=.*/RELEASE=${RELEASE}/g' | sh \
- && apt-get --purge --yes remove curl \
- && apt-get --purge --yes autoremove \
- && apt-get clean \
- && find /tmp -type f -exec rm {} \; \
- && find /var/cache -type f -exec rm {} \; \
- && find /var/lib/apt/lists -type f -exec rm {} \; \
- && find /var/log -type f -exec rm {} \; \
- && find /var/tmp -type f -exec rm {} \;
-
-EXPOSE 3000
-CMD [ "/usr/local/bin/meteor", "run" ] \ No newline at end of file
diff --git a/default/1.7/Dockerfile b/default/1.7/Dockerfile
deleted file mode 100644
index 6ccb293..0000000
--- a/default/1.7/Dockerfile
+++ /dev/null
@@ -1,26 +0,0 @@
-FROM ubuntu:rolling
-LABEL maintainer="info@valentineus.link"
-
-ENV METEOR_ALLOW_SUPERUSER="true"
-ENV RELEASE="1.7"
-WORKDIR "/workspace"
-
-RUN set -ex \
- && apt-get update \
- && apt-get --no-install-recommends --no-install-suggests --yes install \
- ca-certificates \
- curl \
- git \
- openssl \
- && curl https://install.meteor.com | sed 's/^RELEASE=.*/RELEASE=${RELEASE}/g' | sh \
- && apt-get --purge --yes remove curl \
- && apt-get --purge --yes autoremove \
- && apt-get clean \
- && find /tmp -type f -exec rm {} \; \
- && find /var/cache -type f -exec rm {} \; \
- && find /var/lib/apt/lists -type f -exec rm {} \; \
- && find /var/log -type f -exec rm {} \; \
- && find /var/tmp -type f -exec rm {} \;
-
-EXPOSE 3000
-CMD [ "/usr/local/bin/meteor", "run" ] \ No newline at end of file
diff --git a/default/latest/Dockerfile b/default/latest/Dockerfile
index d19b1d0..5252e7e 100644
--- a/default/latest/Dockerfile
+++ b/default/latest/Dockerfile
@@ -2,15 +2,11 @@ FROM ubuntu:rolling
LABEL maintainer="info@valentineus.link"
ENV METEOR_ALLOW_SUPERUSER="true"
-WORKDIR "/workspace"
RUN set -ex \
&& apt-get update \
&& apt-get --no-install-recommends --no-install-suggests --yes install \
- ca-certificates \
- curl \
- git \
- openssl \
+ ca-certificates curl git openssl \
&& curl https://install.meteor.com | sh \
&& apt-get --purge --yes remove curl \
&& apt-get --purge --yes autoremove \
@@ -22,4 +18,5 @@ RUN set -ex \
&& find /var/tmp -type f -exec rm {} \;
EXPOSE 3000
+WORKDIR "/workspace"
CMD [ "/usr/local/bin/meteor", "run" ] \ No newline at end of file
diff --git a/default/1.4/Dockerfile b/default/release/Dockerfile
index 470de98..0eb29a9 100644
--- a/default/1.4/Dockerfile
+++ b/default/release/Dockerfile
@@ -2,16 +2,13 @@ FROM ubuntu:rolling
LABEL maintainer="info@valentineus.link"
ENV METEOR_ALLOW_SUPERUSER="true"
-ENV RELEASE="1.4"
-WORKDIR "/workspace"
+
+ARG release
RUN set -ex \
&& apt-get update \
&& apt-get --no-install-recommends --no-install-suggests --yes install \
- ca-certificates \
- curl \
- git \
- openssl \
+ ca-certificates curl git openssl \
&& curl https://install.meteor.com | sed 's/^RELEASE=.*/RELEASE=${RELEASE}/g' | sh \
&& apt-get --purge --yes remove curl \
&& apt-get --purge --yes autoremove \
@@ -23,4 +20,5 @@ RUN set -ex \
&& find /var/tmp -type f -exec rm {} \;
EXPOSE 3000
+WORKDIR "/workspace"
CMD [ "/usr/local/bin/meteor", "run" ] \ No newline at end of file