refactor: create all builds & make sure they work

AVVS · AVVS · commit c33da3b32072 · 2016-11-08T18:55:54.000+03:00
diff --git a/.gitignore b/.gitignore
@@ -0,0 +1 @@
+*.log
diff --git a/build.sh b/build.sh
@@ -12,39 +12,45 @@ export \
   PUSH_NAMESPACES=makeomatic \
   BASE_NAME=makeomatic/node
 
+BRANCH_NAME=${BRANCH_NAME:-$(git branch | grep  ^*|cut -d" " -f2)}
+echo "working in $BRANCH_NAME"
+BRANCH_NAME=$(echo $BRANCH_NAME | sed -e "s/\//-/g")
+echo "tagging as $BRANCH_NAME"
+
 # install basic scripts
 curl -sSL https://github.com/makeomatic/ci-scripts/raw/master/install.sh | sh -s
-git clone https://github.com/docker-library/official-images.git ~/official-images
+[ -d ~/official-images ] || git clone https://github.com/docker-library/official-images.git ~/official-images
 
 # add scripts to PATH
 export PATH=$PATH:~/ci-scripts
-[ ${BRANCH_NAME} == master ] || export variant=${BRANCH_NAME}
+
+# cleanup logs
+rm -rf ./*.log
 
 # build base node images that are used further in the project
-docker-build -v "${variant}" $BASE_NAME -f node/Dockerfile .
-docker-build -v "${variant}-onbuild" $BASE_NAME -f node/Dockerfile.onbuild .
-docker-build -v "${variant}-tester" $BASE_NAME -f node/Dockerfile.tester .
-docker-build -v "${variant}-tester-glibc" $BASE_NAME -f node/Dockerfile.tester-glibc .
+docker-build $BASE_NAME -f node/Dockerfile .
+docker-build -v "onbuild" $BASE_NAME -f node/Dockerfile.onbuild .
+docker-build -v "tester" $BASE_NAME -f node/Dockerfile.tester .
+docker-build -v "tester-glibc" $BASE_NAME -f node/Dockerfile.tester-glibc .
 # build node images with ruby
-docker-build -v "${variant}-ruby" $BASE_NAME -f node-ruby/Dockerfile .
+docker-build -v "ruby" $BASE_NAME -f node-ruby/Dockerfile .
 # build node images with ssh embedded
-docker-build -v "${variant}-ssh" $BASE_NAME -f node-ssh/Dockerfile .
-docker-build -v "${variant}-ssh-onbuild" $BASE_NAME -f node-ssh/Dockerfile.onbuild .
+docker-build -v "ssh" $BASE_NAME -f node-ssh/Dockerfile .
+docker-build -v "ssh-onbuild" $BASE_NAME -f node-ssh/Dockerfile.onbuild .
 # build node images with libvips
-docker-build -v "${variant}-vips" $BASE_NAME -f node-vips/Dockerfile .
-docker-build -v "${variant}-vips-onbuild" $BASE_NAME -f node-vips/Dockerfile.onbuild .
-docker-build -v "${variant}-vips-tester-glibc" $BASE_NAME -f node-vips/Dockerfile.tester-glibc .
+docker-build -v "vips" $BASE_NAME -f node-vips/Dockerfile .
+docker-build -v "vips-onbuild" $BASE_NAME -f node-vips/Dockerfile.onbuild .
+docker-build -v "vips-tester-glibc" $BASE_NAME -f node-vips/Dockerfile.tester-glibc .
 # build node images with libvips & ssh
-docker-build -v "${variant}-vips-ssh" $BASE_NAME -f node-vips-ssh/Dockerfile .
-docker-build -v "${variant}-vips-ssh-onbuild" $BASE_NAME -f node-vips-ssh/Dockerfile.onbuild .
+docker-build -v "vips-ssh" $BASE_NAME -f node-vips-ssh/Dockerfile .
+docker-build -v "vips-ssh-onbuild" $BASE_NAME -f node-vips-ssh/Dockerfile.onbuild .
 
 # List of newly created images
-export images=$(docker images | grep "^$BASE_NAME" | tr -s '[:space:]' | cut -f1,2 -d' ' | sed 's/ /:/')
+export images=$(docker images $BASE_NAME | tr -s '[:space:]' | cut -f1,2 -d' ' | sed 's/ /:/')
 
 # we actually need to
 # Push to docker when DEPLOY is true
-# docker login -u $DOCKER_USERNAME -p $DOCKER_PASSWORD
-[ ${BRANCH_NAME} == master ] && for image in $images; do docker push $image; done
+[ ${BRANCH_NAME} = master ] && for image in $images; do docker push $image; done
 
 # report
-docker images
+docker images $BASE_NAME
diff --git a/node-ruby/Dockerfile b/node-ruby/Dockerfile
@@ -27,7 +27,7 @@ RUN \
     echo 'update: --no-document'; \
   } >> /usr/local/etc/gemrc \
   && set -ex \
-  && apk add --no-cache --update --virtual .builddeps \
+  && apk add --no-cache --virtual .builddeps \
     bison \
     bzip2 \
     bzip2-dev \
@@ -75,6 +75,7 @@ RUN \
     ./configure --disable-install-doc \
   && make -j"$(getconf _NPROCESSORS_ONLN)" \
   && make install \
+  && gem update --system $RUBYGEMS_VERSION \
   && cd / \
   && curl -sSL https://nodejs.org/dist/${NODE_VERSION}/node-${NODE_VERSION}.tar.gz | tar -xz \
   && cd /node-${NODE_VERSION} \
@@ -96,7 +97,6 @@ RUN \
   )" \
   && apk add --virtual .rundeps $runDeps \
   && apk del .builddeps \
-  && gem update --system $RUBYGEMS_VERSION \
   && rm -rf /node-${NODE_VERSION} \
     /usr/src/ruby \
     /usr/share/man /tmp/* /root/.npm /root/.node-gyp \
diff --git a/node-ssh/Dockerfile b/node-ssh/Dockerfile
@@ -1,4 +1,4 @@
-FROM node:6.9.1
+FROM makeomatic/node:6.9.1
 
 # add extra packages
 RUN \
diff --git a/node-vips-ssh/Dockerfile b/node-vips-ssh/Dockerfile
@@ -1,5 +1,5 @@
 FROM makeomatic/node:6.9.1-vips
 
-RUN apk add --no-cache --update --virtual .flavorDeps \
+RUN apk add --no-cache --virtual .flavorDeps \
   openssh \
   git
diff --git a/node-vips-ssh/Dockerfile.onbuild b/node-vips-ssh/Dockerfile.onbuild
@@ -5,10 +5,10 @@ ONBUILD WORKDIR /src
 ONBUILD COPY package.json .
 ONBUILD COPY ./keys/* /tmp/.ssh/
 ONBUILD RUN \
-  apk add --no-cache --update --virtual .buildDeps \
+  apk add --no-cache --virtual .buildDeps \
     g++ \
     make \
-    vips-dev \
+    vips-dev@testing \
   && GIT_SSH_COMMAND="ssh -i /tmp/.ssh/id_rsa -F /dev/null" npm install --production \
   && npm dedupe \
   && apk del .buildDeps .flavorDeps \
diff --git a/node-vips/Dockerfile b/node-vips/Dockerfile
@@ -1,4 +1,6 @@
 FROM makeomatic/node:6.9.1
 
 # add libvips
-RUN apk add --no-cache --update vips
+RUN \
+  echo "@testing http://dl-cdn.alpinelinux.org/alpine/edge/testing" >> /etc/apk/repositories \
+  && apk add --no-cache vips@testing
diff --git a/node-vips/Dockerfile.onbuild b/node-vips/Dockerfile.onbuild
@@ -4,11 +4,11 @@ ONBUILD WORKDIR /src
 
 ONBUILD COPY package.json .
 ONBUILD RUN \
-  apk add --no-cache --update --virtual .flavorDeps \
+  apk add --no-cache --virtual .flavorDeps \
     git \
     g++ \
     make \
-    vips-dev \
+    vips-dev@testing \
   && npm install --production \
   && npm dedupe \
   && apk del .flavorDeps \
diff --git a/node-vips/Dockerfile.tester-glibc b/node-vips/Dockerfile.tester-glibc
@@ -4,7 +4,8 @@ ENV GLIBC_VER 2.23-r3
 
 # to build native deps
 RUN \
-  apk --no-cache add \
+  apk add --update \
+    vips-dev@testing \
     build-base \
     python \
     make \
@@ -13,10 +14,12 @@ RUN \
     make \
     g++ \
     linux-headers \
-  && apk add --no-cache libvips-dev --repository http://cdn.matic.ninja/apk/community \
   && printf '-----BEGIN PUBLIC KEY-----\nMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEApZ2u1KJKUu/fW4A25y9m\ny70AGEa/J3Wi5ibNVGNn1gT1r0VfgeWd0pUybS4UmcHdiNzxJPgoWQhV2SSW1JYu\ntOqKZF5QSN6X937PTUpNBjUvLtTQ1ve1fp39uf/lEXPpFpOPL88LKnDBgbh7wkCp\nm2KzLVGChf83MS0ShL6G9EQIAUxLm99VpgRjwqTQ/KfzGtpke1wqws4au0Ab4qPY\nKXvMLSPLUp7cfulWvhmZSegr5AdhNw5KNizPqCJT8ZrGvgHypXyiFvvAH5YRtSsc\nZvo9GI2e2MaZyo9/lvb+LbLEJZKEQckqRj4P26gmASrZEPStwc+yqy1ShHLA0j6m\n1QIDAQAB\n-----END PUBLIC KEY-----\n' > /etc/apk/keys/sgerrand.rsa.pub \
   && wget https://github.com/sgerrand/alpine-pkg-glibc/releases/download/${GLIBC_VER}/glibc-${GLIBC_VER}.apk \
   && apk add glibc-${GLIBC_VER}.apk \
-  && rm glibc-${GLIBC_VER}.apk
+  && rm -rf \
+    glibc-${GLIBC_VER}.apk \
+    /etc/apk/cache/* \
+    /var/cache/apk/*
 
 WORKDIR /src
diff --git a/node/Dockerfile b/node/Dockerfile
@@ -8,7 +8,7 @@ ENV NODE_VERSION=v6.9.1 \
     NODE_HOME=/usr/local
 
 RUN \
-  apk add --no-cache --update --virtual .node-buildDeps \
+  apk add --no-cache --virtual .node-buildDeps \
     git \
     curl \
     make \

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-FROM node:6.9.1`
	`1`	`+FROM makeomatic/node:6.9.1`
`2`	`2`
`3`	`3`	`# add extra packages`
`4`	`4`	`RUN \`