From c91f02f527c49a77a60b9d15d7f30716b743dbb5 Mon Sep 17 00:00:00 2001 From: JP Swinski Date: Sat, 28 Sep 2024 02:22:29 +0000 Subject: [PATCH] fixed makefile for building sliderule docker --- targets/slideruleearth-aws/Makefile | 6 ++++++ .../slideruleearth-aws/docker/sliderule/Dockerfile.runtime | 3 +++ 2 files changed, 9 insertions(+) diff --git a/targets/slideruleearth-aws/Makefile b/targets/slideruleearth-aws/Makefile index 257afd7c..e0df7dcb 100644 --- a/targets/slideruleearth-aws/Makefile +++ b/targets/slideruleearth-aws/Makefile @@ -62,6 +62,9 @@ CSHELPH_VERSION = $(shell git --work-tree ${CSHELPH_SOURCE_DIR} --git-dir ${CSHE MEDIANFILTER_SOURCE_DIR ?= $(ROOT)/../ut-ATL24-medianfilter MEDIANFILTER_SOURCE_FILE = $(MEDIANFILTER_SOURCE_DIR)/medianmodel.py MEDIANFILTER_VERSION = $(shell git --work-tree ${MEDIANFILTER_SOURCE_DIR} --git-dir ${MEDIANFILTER_SOURCE_DIR}/.git describe --abbrev --dirty --always --tags --long) +COASTNET_DIR = $(ROOT)/../ut-ATL24-coastnet +QTREES_DIR = $(ROOT)/../ut-ATL24-qtrees +OPENOCEANSPP_DIR = $(ROOT)/../ut-ATL24-oopp INSTALLDIR ?= $(SLIDERULE_STAGE_DIR) @@ -215,6 +218,9 @@ sliderule-docker: ## build sliderule docker image using buildenv container; need -rm -Rf $(SLIDERULE_STAGE_DIR) mkdir -p $(SLIDERULE_STAGE_DIR) rsync -a $(ROOT) $(SLIDERULE_STAGE_DIR)/sliderule --exclude build --exclude stage + rsync -a $(COASTNET_DIR) $(SLIDERULE_STAGE_DIR) --exclude models + rsync -a $(QTREES_DIR) $(SLIDERULE_STAGE_DIR) --exclude models + rsync -a $(OPENOCEANSPP_DIR) $(SLIDERULE_STAGE_DIR) cp docker/sliderule/Dockerfile.runtime $(SLIDERULE_STAGE_DIR)/Dockerfile cp docker/sliderule/config.json $(SLIDERULE_STAGE_DIR) cd $(SLIDERULE_STAGE_DIR); docker $(BUILDX) build $(DOCKEROPTS) --build-arg repo=$(ECR) -t $(ECR)/sliderule:latest $(DOCKER_PLATFORM) . diff --git a/targets/slideruleearth-aws/docker/sliderule/Dockerfile.runtime b/targets/slideruleearth-aws/docker/sliderule/Dockerfile.runtime index 70b4f765..3b8333f3 100644 --- a/targets/slideruleearth-aws/docker/sliderule/Dockerfile.runtime +++ b/targets/slideruleearth-aws/docker/sliderule/Dockerfile.runtime @@ -3,6 +3,9 @@ FROM $repo/sliderule-buildenv:latest AS buildenv # copy sliderule source repository COPY sliderule /sliderule +COPY ut-ATL24-coastnet /ut-ATL24-coastnet +COPY ut-ATL24-qtrees /ut-ATL24-qtrees +COPY ut-ATL24-oopp /ut-ATL24-oopp # build and install sliderule application WORKDIR /sliderule/targets/slideruleearth-aws