Dapper base image (#37)

Add dapper base-image and deployment logic, using original dapper-base until we have it in quay.

Author: mkolesnik

.travis.yml

@@ -10,7 +10,7 @@ git:
 
 jobs:
   include:
-  - env: CMD="make validate"
+  - env: CMD="make validate" DEPLOY=true
 
 install:
   - sudo apt-get install moreutils # make ts available
@@ -21,3 +21,10 @@ services:
 script:
   - set -o pipefail;
     $CMD 2>&1 | ts '[%H:%M:%.S]' -s
+
+deploy:
+  - provider: script
+    script: bash scripts/release
+    on:
+      branch: master
+      condition: $DEPLOY = true

Makefile

@@ -8,7 +8,10 @@ TARGETS := $(shell ls scripts)
 	@./.dapper.tmp -v
 	@mv .dapper.tmp .dapper
 
-$(TARGETS): .dapper
+shell:
+	./.dapper -m bind -s
+
+$(TARGETS): .dapper dapper-image
 	./.dapper -m bind $@
 
 .DEFAULT_GOAL := ci

package/Dockerfile.dapper-base

@@ -0,0 +1,55 @@
+FROM fedora:30
+
+ENV DAPPER_HOST_ARCH=amd64
+ENV HOST_ARCH=${DAPPER_HOST_ARCH} ARCH=${DAPPER_HOST_ARCH} \
+    LINT_VERSION=v1.16.0 \
+    HELM_VERSION=v2.14.1 \
+    KIND_VERSION=v0.6.1 \
+    KUBEFED_VERSION=0.1.0-rc3
+
+ENV GOLANG_ARCH_amd64=amd64 GOLANG_ARCH_arm=armv6l GOLANG_ARCH=GOLANG_ARCH_${ARCH} \
+    GOPATH=/go GO111MODULE=on PATH=/go/bin:/usr/local/go/bin:${PATH} SHELL=/bin/bash GOFLAGS=-mod=vendor \
+    GOPROXY=https://proxy.golang.org
+
+# Requirements:
+# Component      | Usage
+# -----------------------------------------------------------
+# gcc            | ginkgo
+# git            | find the workspace root
+# curl           | download other tools
+# moby-engine    | Dapper (Docker)
+# golang         | build
+# kubectl        | e2e tests (in kubernetes-client)
+# golangci-lint  | code linting
+# helm           | e2e tests
+# kubefedctl     | e2e tests
+# kind           | e2e tests
+# ginkgo         | tests
+# goimports      | code formatting
+# make           | OLM installation
+# findutils      | e2e cleanup (xargs)
+# upx            | binary compression
+# jq             | JSON processing (GitHub API)
+# diffutils      | required for goimports
+RUN dnf -y distrosync --nodocs --setopt=install_weak_deps=False && \
+    dnf -y install --nodocs --setopt=install_weak_deps=False gcc git-core curl moby-engine make golang kubernetes-client findutils upx jq && \
+    dnf -y remove acl dnf-yum langpacks-en libevent libsemanage libsss_idmap libxcrypt-compat mkpasswd openssl python3-pip python3-setuptools \
+           sssd-client unbound-libs whois-nls && \
+    rpm -e --nodeps selinux-policy-targeted && \
+    dnf -y clean all && \
+    curl -sfL https://install.goreleaser.com/github.com/golangci/golangci-lint.sh | sh -s -- -b $(go env GOPATH)/bin ${LINT_VERSION} && \
+    curl "https://storage.googleapis.com/kubernetes-helm/helm-${HELM_VERSION}-linux-${ARCH}.tar.gz" | tar -xzf - && \
+    mv linux-${ARCH}/helm /usr/bin/ && chmod a+x /usr/bin/helm && rm -rf linux-${ARCH} && \
+    curl -L "https://github.com/kubernetes-sigs/kubefed/releases/download/v${KUBEFED_VERSION}/kubefedctl-${KUBEFED_VERSION}-linux-${ARCH}.tgz" | tar -xzf - && \
+    mv kubefedctl /usr/bin/ && chmod a+x /usr/bin/kubefedctl && \
+    curl -Lo /usr/bin/kind "https://github.com/kubernetes-sigs/kind/releases/download/${KIND_VERSION}/kind-linux-${ARCH}" && chmod a+x /usr/bin/kind && \
+    GOFLAGS="" go get -v github.com/onsi/ginkgo/ginkgo && \
+    GOFLAGS="" go get -v golang.org/x/tools/cmd/goimports && \
+    upx /go/bin/ginkgo /go/bin/goimports /go/bin/golangci-lint /usr/bin/containerd /usr/bin/docker /usr/bin/dockerd /usr/bin/helm /usr/bin/kubectl \
+        /usr/bin/kubefedctl && \
+    ln -f /usr/bin/kubectl /usr/bin/hyperkube
+
+# Copy CI deployment scripts into image to share with all submariner-io/* projects
+# TODO: uncomment when we have the scripts
+#WORKDIR /opt/kind-e2e
+#COPY scripts/kind-e2e/ .

scripts/dapper-image

@@ -0,0 +1,44 @@
+#!/bin/bash
+set -e
+
+#
+# The purpose of this script is to ensure that dapper-base:latest is updated and available locally
+# and if dapper-base is modified we make sure it's rebuilt and tagged locally so any next
+# execution through dapper will have the new image.
+#
+
+source $(dirname $0)/lib/debug_functions
+source $(dirname $0)/lib/version
+
+ARCH=${ARCH:-"amd64"}
+SUFFIX=""
+[ "${ARCH}" != "amd64" ] && SUFFIX="_${ARCH}"
+
+TAG=${TAG:-${VERSION}${SUFFIX}}
+REPO=${REPO:-quay.io/submariner}
+
+DAPPER_BASE_IMAGE=${REPO}/shipyard-dapper-base:${TAG}
+
+# always compare with upstream master, which is the source for the published dapper image
+UPSTREAM_REMOTE=$(git remote -v | grep submariner-io/shipyard | awk '{ print $1 }' | head -n 1)
+CHANGED_FILES_LOCAL=$(git diff --name-only remotes/$UPSTREAM_REMOTE/master)
+
+# Detect when we are on a merged patch
+LAST_COMMIT_LOCAL=$(git rev-parse HEAD)
+LAST_COMMIT_MASTER=$(git rev-parse remotes/$UPSTREAM_REMOTE/master)
+
+
+
+if [[ "${CHANGED_FILES_PR[@]}" =~ "package/Dockerfile.dapper-base" ]] ||
+   [[ "${CHANGED_FILES_LOCAL[@]}" =~ "package/Dockerfile.dapper-base" ]] ||
+   [[ "${LAST_COMMIT_LOCAL}" == "${LAST_COMMIT_MASTER}" ]]; then
+      echo "Dockerfile.dapper-base was modified, rebuilding dapper image"
+      docker build -t ${DAPPER_BASE_IMAGE} -f package/Dockerfile.dapper-base .
+      docker tag ${DAPPER_BASE_IMAGE} ${REPO}/shipyard-dapper-base:latest
+else
+      docker pull ${REPO}/shipyard-dapper-base:latest || :
+      # make sure the tag is also available for release, even if no changes happened
+      docker tag ${REPO}/shipyard-dapper-base:latest ${DAPPER_BASE_IMAGE}
+fi
+
+

scripts/release

@@ -0,0 +1,26 @@
+#!/usr/bin/env bash
+set -e
+
+DEPLOY="${DEPLOY:-false}"
+
+
+source $(dirname $0)/lib/debug_functions
+source $(dirname $0)/lib/version
+
+
+# This flag is passed from travis, so only the right jobs will deploy the
+# container images to quay
+
+if [ "$DEPLOY" != "true" ] ; then
+    echo "We don't need to deploy from this job, if you're trying to deploy manually set DEPLOY=true"
+    exit 0
+fi
+
+
+DOCKER_TAG=${1:-latest}
+REPO=${REPO:-quay.io/submariner}
+
+echo "$QUAY_PASSWORD" | docker login quay.io -u "$QUAY_USERNAME" --password-stdin
+docker tag ${REPO}/shipyard-dapper-base:${VERSION} ${REPO}/shipyard-dapper-base:${DOCKER_TAG#"v"}
+docker tag ${REPO}/shipyard-dapper-base:${VERSION} ${REPO}/shipyard-dapper-base:"${TRAVIS_COMMIT:0:7}"
+for i in $(docker images --format "{{.Repository}}:{{.Tag}}" | grep -E "${REPO}/.*:(${DOCKER_TAG#v}|${TRAVIS_COMMIT:0:7})"); do docker push $i; done