Reconfiguration of the build algorithm

2018-08-15 18:28:35 +04:00 · 2018-08-15 18:28:35 +04:00 · 8f92f77d5a
commit 8f92f77d5a
parent 9bf889fa15
11 changed files with 26 additions and 199 deletions
--- 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}/'"
+after_success:
+  - "curl -H 'Content-Type: application/json' --data '{\"docker_tag\":\"${TAG}\"}' -X POST 'https://registry.hub.docker.com/u/valentineus/meteor/trigger/${TOKEN}/'"
--- a/build/1.5/Dockerfile
+++ b/build/1.5/Dockerfile
@ -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" ]
--- a/build/1.6/Dockerfile
+++ b/build/1.6/Dockerfile
@ -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" ]
--- a/build/1.7/Dockerfile
+++ b/build/1.7/Dockerfile
@ -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" ]
--- 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" ]
--- a/build/release/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" ]
--- a/default/1.5/Dockerfile
+++ b/default/1.5/Dockerfile
@ -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" ]
--- a/default/1.6/Dockerfile
+++ b/default/1.6/Dockerfile
@ -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" ]
--- a/default/1.7/Dockerfile
+++ b/default/1.7/Dockerfile
@ -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" ]
--- 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" ]
--- a/default/release/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" ]