Update Makefile
This ps updates the build commands to allow the same format to be used in att-comdev projects Change-Id: Iafc95d6c6a5cfa5cfe1e3c562a86ddacd928a079
This commit is contained in:
parent
b162715f82
commit
a4bd79630d
39
Makefile
39
Makefile
|
@ -12,15 +12,29 @@
|
||||||
# See the License for the specific language governing permissions and
|
# See the License for the specific language governing permissions and
|
||||||
# limitations under the License.
|
# limitations under the License.
|
||||||
|
|
||||||
AIRFLOW_IMAGE_NAME ?= airflow
|
DOCKER_REGISTRY ?= quay.io
|
||||||
IMAGE_PREFIX ?= attcomdev
|
IMAGE_PREFIX ?= attcomdev
|
||||||
IMAGE_TAG ?= latest
|
IMAGE_TAG ?= latest
|
||||||
SHIPYARD_IMAGE_NAME ?= shipyard
|
|
||||||
HELM ?= helm
|
HELM ?= helm
|
||||||
LABEL ?= commit-id
|
LABEL ?= commit-id
|
||||||
# Build all docker images for this project
|
IMAGE_NAME := airflow shipyard
|
||||||
|
|
||||||
|
IMAGE:=${DOCKER_REGISTRY}/${IMAGE_PREFIX}/$(IMAGE_NAME):${IMAGE_TAG}
|
||||||
|
IMAGE_DIR:=images/$(IMAGE_NAME)
|
||||||
|
|
||||||
.PHONY: images
|
.PHONY: images
|
||||||
images: build_airflow build_shipyard
|
#Build all images in the list
|
||||||
|
images: $(IMAGE_NAME)
|
||||||
|
#Build and run all images in list
|
||||||
|
#sudo make images IMAGE_NAME=airflow will Build and Run airflow
|
||||||
|
#sudo make images will build and run airflow and shipyard
|
||||||
|
$(IMAGE_NAME):
|
||||||
|
@echo
|
||||||
|
@echo "===== Processing [$@] image ====="
|
||||||
|
@make build_$@ IMAGE=${DOCKER_REGISTRY}/${IMAGE_PREFIX}/$@:${IMAGE_TAG} IMAGE_DIR=images/$@
|
||||||
|
@make run IMAGE=${DOCKER_REGISTRY}/${IMAGE_PREFIX}/$@:${IMAGE_TAG} SCRIPT=./tools/$@_image_run.sh
|
||||||
|
|
||||||
|
# Build all docker images for this project
|
||||||
|
|
||||||
# Create tgz of the chart
|
# Create tgz of the chart
|
||||||
.PHONY: charts
|
.PHONY: charts
|
||||||
|
@ -41,26 +55,19 @@ dry-run: clean
|
||||||
.PHONY: docs
|
.PHONY: docs
|
||||||
docs: clean build_docs
|
docs: clean build_docs
|
||||||
|
|
||||||
.PHONY: run_images
|
|
||||||
run_images: run_shipyard run_airflow
|
|
||||||
|
|
||||||
# Make targets intended for use by the primary targets above.
|
# Make targets intended for use by the primary targets above.
|
||||||
|
|
||||||
.PHONY: run_shipyard
|
.PHONY: run
|
||||||
run_shipyard: clean build_shipyard
|
run:
|
||||||
tools/shipyard_image_run.sh $(IMAGE_PREFIX) $(SHIPYARD_IMAGE_NAME) $(IMAGE_TAG)
|
$(SCRIPT) $(IMAGE)
|
||||||
|
|
||||||
.PHONY: run_airflow
|
|
||||||
run_airflow: clean build_airflow
|
|
||||||
tools/airflow_image_run.sh $(IMAGE_PREFIX) $(AIRFLOW_IMAGE_NAME) $(IMAGE_TAG)
|
|
||||||
|
|
||||||
.PHONY: build_airflow
|
.PHONY: build_airflow
|
||||||
build_airflow:
|
build_airflow:
|
||||||
docker build -t $(IMAGE_PREFIX)/$(AIRFLOW_IMAGE_NAME):$(IMAGE_TAG) --label $(LABEL) images/airflow/
|
docker build -t $(IMAGE) --label $(LABEL) -f $(IMAGE_DIR)/Dockerfile $(IMAGE_DIR)
|
||||||
|
|
||||||
.PHONY: build_shipyard
|
.PHONY: build_shipyard
|
||||||
build_shipyard:
|
build_shipyard:
|
||||||
docker build -t $(IMAGE_PREFIX)/$(SHIPYARD_IMAGE_NAME):$(IMAGE_TAG) --label $(LABEL) -f images/shipyard/Dockerfile .
|
docker build -t $(IMAGE) --label $(LABEL) -f $(IMAGE_DIR)/Dockerfile .
|
||||||
|
|
||||||
.PHONY: clean
|
.PHONY: clean
|
||||||
clean:
|
clean:
|
||||||
|
|
|
@ -15,13 +15,11 @@
|
||||||
#
|
#
|
||||||
set -x
|
set -x
|
||||||
|
|
||||||
IMAGE_PREFIX=$1
|
|
||||||
AIRFLOW_IMAGE_NAME=$2
|
|
||||||
IMAGE_TAG=$3
|
|
||||||
|
|
||||||
|
IMAGE=$1
|
||||||
TEST_RESP="$(docker run \
|
TEST_RESP="$(docker run \
|
||||||
-p 8080:8080 \
|
-p 8080:8080 \
|
||||||
--name airflow_test ${IMAGE_PREFIX}/${AIRFLOW_IMAGE_NAME}:${IMAGE_TAG} \
|
--name airflow_test ${IMAGE} \
|
||||||
quicktest)"
|
quicktest)"
|
||||||
|
|
||||||
docker stop airflow_test
|
docker stop airflow_test
|
||||||
|
|
|
@ -15,9 +15,7 @@
|
||||||
#
|
#
|
||||||
set -x
|
set -x
|
||||||
|
|
||||||
IMAGE_PREFIX=$1
|
IMAGE=$1
|
||||||
SHIPYARD_IMAGE_NAME=$2
|
|
||||||
IMAGE_TAG=$3
|
|
||||||
|
|
||||||
# Collect necessary files and run shipyard image in docker
|
# Collect necessary files and run shipyard image in docker
|
||||||
mkdir -p build/.tmprun/etc
|
mkdir -p build/.tmprun/etc
|
||||||
|
@ -26,7 +24,7 @@ cp $PWD/tools/resources/shipyard.conf build/.tmprun/etc
|
||||||
docker run \
|
docker run \
|
||||||
-v $PWD/build/.tmprun/etc:/etc/shipyard \
|
-v $PWD/build/.tmprun/etc:/etc/shipyard \
|
||||||
-p 9000:9000 \
|
-p 9000:9000 \
|
||||||
--name shipyard_test ${IMAGE_PREFIX}/${SHIPYARD_IMAGE_NAME}:${IMAGE_TAG} \
|
--name shipyard_test ${IMAGE} \
|
||||||
&
|
&
|
||||||
|
|
||||||
sleep 5
|
sleep 5
|
||||||
|
|
Loading…
Reference in New Issue