WIP: Update wercker to use Makefile for image build

Signed-off-by: Kashif Saadat <[email protected]>

Author: KashifSaadat

Makefile

@@ -23,6 +23,7 @@ endif
 
 PKG             := github.com/oracle/mysql-operator
 REGISTRY        := iad.ocir.io
+IMAGE_PREFIX    ?= $(REGISTRY)/$(TENANT)
 SRC_DIRS        := cmd pkg test/examples
 CMD_DIRECTORIES := $(sort $(dir $(wildcard ./cmd/*/)))
 COMMANDS        := $(CMD_DIRECTORIES:./cmd/%/=%)
@@ -71,13 +72,18 @@ build: dist build-dirs Makefile
 	cp $(BINARIES) ./bin/$(OS)_$(ARCH)/
 
 .PHONY: build-docker
-build-docker:
+build-docker: build-docker-mysql-operator build-docker-mysql-agent
+
+.PHONY: build-docker-mysql-operator
+build-docker-mysql-operator:
 	@docker build \
 	--build-arg=http_proxy \
 	--build-arg=https_proxy \
-	-t $(REGISTRY)/$(TENANT)/mysql-operator:$(VERSION) \
+	-t $(IMAGE_PREFIX)/mysql-operator:$(VERSION) \
 	-f docker/mysql-operator/Dockerfile .
 
+.PHONY: build-docker-mysql-agent
+build-docker-mysql-agent:
 	# Retrieve the UID for the mysql user, passed in when building the mysql-agent image
 	$(eval MYSQL_AGENT_IMAGE := $(shell sed -n 's/^FROM \(.*\)/\1/p' docker/mysql-agent/Dockerfile))
 	$(eval MYSQL_UID=$(shell docker run --rm --entrypoint id ${MYSQL_AGENT_IMAGE} -u mysql))
@@ -86,7 +92,7 @@ build-docker:
 	--build-arg=http_proxy \
 	--build-arg=https_proxy \
 	--build-arg=MYSQL_USER=${MYSQL_UID} \
-	-t $(REGISTRY)/$(TENANT)/mysql-agent:$(VERSION) \
+	-t $(IMAGE_PREFIX)/mysql-agent:$(VERSION) \
 	-f docker/mysql-agent/Dockerfile .
 
 # Note: Only used for development, i.e. in CI the images are pushed using Wercker.

wercker.yml

@@ -36,105 +36,103 @@ build:
         cp -R mysql-operator ${WERCKER_OUTPUT_DIR}/
         cp -R .git ${WERCKER_OUTPUT_DIR}/
 
-push-operator-image:
-  box:
-    id: oraclelinux:7.3
+build-image:
+  base-path: "/go/src/github.com/oracle/mysql-operator"
   steps:
     - script:
       name: set environment variables
       code: |
+        export IMAGE_PREFIX=wercker-build
         export VERSION=$(cat dist/version.txt)
-        echo "Pushing operator version ${VERSION}"
+        echo "Building mysql operator & agent images with version: ${VERSION}"
+
+    - script:
+      name: build mysql-operator image
+      code: make build-docker-mysql-operator
 
     - script:
-      name: prepare
+      name: build mysql-agent image
+      code: make build-docker-mysql-agent
+
+push-operator-image:
+  steps:
+    - script:
+      name: set environment variables
       code: |
-        mv bin/mysql-operator /mysql-operator
-        chmod +x /mysql-operator
+        export IMAGE_PREFIX=wercker-build
+        export VERSION=$(cat dist/version.txt)
 
     - internal/docker-push:
+      image-name: ${IMAGE_PREFIX}/mysql-operator:${VERSION}
       registry: https://iad.ocir.io/v2
       repository: iad.ocir.io/oracle/mysql-operator
       tag: $VERSION
-      entrypoint: /mysql-operator
       username: $OCIRUSERNAME
       password: $OCIRPASSWORD
 
     - internal/docker-push:
+      image-name: ${IMAGE_PREFIX}/mysql-operator:${VERSION}
       registry: https://lhr.ocir.io/v2
       repository: lhr.ocir.io/oracle/mysql-operator
       tag: $VERSION
-      entrypoint: /mysql-operator
       username: $OCIRUSERNAME
       password: $OCIRPASSWORD
 
     - internal/docker-push:
+      image-name: ${IMAGE_PREFIX}/mysql-operator:${VERSION}
       registry: https://phx.ocir.io/v2
       repository: phx.ocir.io/oracle/mysql-operator
       tag: $VERSION
-      entrypoint: /mysql-operator
       username: $OCIRUSERNAME
       password: $OCIRPASSWORD
 
     - internal/docker-push:
+      image-name: ${IMAGE_PREFIX}/mysql-operator:${VERSION}
       registry: https://fra.ocir.io/v2
       repository: fra.ocir.io/oracle/mysql-operator
       tag: $VERSION
-      entrypoint: /mysql-operator
       username: $OCIRUSERNAME
       password: $OCIRPASSWORD
 
 push-agent-image:
-  box:
-    id: mysql/mysql-server:8.0.11
   steps:
     - script:
       name: set environment variables
       code: |
+        export IMAGE_PREFIX=wercker-build
         export VERSION=$(cat dist/version.txt)
-        echo "Pushing agent version ${VERSION}"
-
-    - script:
-      name: prepare
-      code: |
-        mv bin/mysql-agent /mysql-agent
-        chmod +x /mysql-agent
 
     - internal/docker-push:
+      image-name: ${IMAGE_PREFIX}/mysql-agent:${VERSION}
       registry: https://iad.ocir.io/v2
       username: $OCIRUSERNAME
       password: $OCIRPASSWORD
       repository: iad.ocir.io/oracle/mysql-agent
       tag: $VERSION
-      entrypoint: /mysql-agent
-      user: mysql
 
     - internal/docker-push:
+      image-name: ${IMAGE_PREFIX}/mysql-agent:${VERSION}
       registry: https://lhr.ocir.io/v2
       username: $OCIRUSERNAME
       password: $OCIRPASSWORD
       repository: lhr.ocir.io/oracle/mysql-agent
       tag: $VERSION
-      entrypoint: /mysql-agent
-      user: mysql
 
     - internal/docker-push:
+      image-name: ${IMAGE_PREFIX}/mysql-agent:${VERSION}
       registry: https://phx.ocir.io/v2
       username: $OCIRUSERNAME
       password: $OCIRPASSWORD
       repository: phx.ocir.io/oracle/mysql-agent
       tag: $VERSION
-      entrypoint: /mysql-agent
-      user: mysql
 
     - internal/docker-push:
+      image-name: ${IMAGE_PREFIX}/mysql-agent:${VERSION}
       registry: https://fra.ocir.io/v2
       username: $OCIRUSERNAME
       password: $OCIRPASSWORD
       repository: fra.ocir.io/oracle/mysql-agent
       tag: $VERSION
-      entrypoint: /mysql-agent
-      user: mysql
 
 e2e-test:
   base-path: "/go/src/github.com/oracle/mysql-operator"