Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chore: Reuse existing developer image #66

Merged
merged 2 commits into from
Oct 30, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 7 additions & 2 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -34,14 +34,19 @@ build:
build.develop:
./scripts/build_docker.sh --target develop

.PHONY: use.develop
## Check if developer image exists, build it if it doesn't
use.develop:
./scripts/build_docker.sh --target develop --use-existing

.PHONY: develop
## Run interactive shell inside developer container
develop: build.develop
develop: use.develop
./scripts/develop.sh

.PHONY: run
## Run make target inside developer container (e.g. `make run fmt`)
run: build.develop
run: use.develop
./scripts/develop.sh make $(RUN_ARGS)

.PHONY: test
Expand Down
16 changes: 14 additions & 2 deletions scripts/build_docker.sh
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.#
# limitations under the License.

USAGE="$(
cat <<EOF
Expand Down Expand Up @@ -40,6 +40,10 @@ while (("$#")); do
-h | --help)
usage
;;
--use-existing)
use_existing=true
shift 1
;;
-t | --target)
if [ -n "$2" ] && [ "${2:0:1}" != "-" ]; then
DOCKER_TARGET=$2
Expand Down Expand Up @@ -67,14 +71,22 @@ done

DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" >/dev/null 2>&1 && pwd)"

cd "$DIR/.." ||
cd "$DIR/.."

IMAGE_SUFFIX=""

if [ "${DOCKER_TARGET}" != "runtime" ]; then
IMAGE_SUFFIX="-${DOCKER_TARGET}"
fi

if [[ $use_existing == "true" ]]; then
DOCKER_IMAGE="${DOCKER_USER}/modelmesh-runtime-adapter${IMAGE_SUFFIX}:${IMAGE_TAG}"
if docker image inspect "${DOCKER_IMAGE}" >/dev/null 2>&1; then
echo "Using existing image: ${DOCKER_IMAGE}"
exit 0
fi
fi

declare -a docker_args=(
--target "${DOCKER_TARGET}"
-t "${DOCKER_USER}/modelmesh-runtime-adapter${IMAGE_SUFFIX}:${DOCKER_TAG}"
Expand Down
10 changes: 7 additions & 3 deletions scripts/develop.sh
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.#
# limitations under the License.

USAGE="$(
cat <<EOF
Expand All @@ -22,11 +22,15 @@ usage: $0 [optional command]
[-h | --help] Display this help
EOF
)"

usage() {
echo "$USAGE" >&2
exit 1
}

DOCKER_USER=${DOCKER_USER:-"kserve"}
IMAGE_TAG=${IMAGE_TAG:-"latest"}

# PARAMS=""

# while (("$#")); do
Expand All @@ -50,7 +54,7 @@ usage() {
# eval set -- "$PARAMS"

DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )"
cd "${DIR}/.." ||
cd "${DIR}/.."

# Make sure .bash_history exists and is a file
touch .bash_history
Expand All @@ -73,4 +77,4 @@ fi
# Run the develop container with local source mounted in
docker run --rm \
"${docker_run_args[@]}" \
kserve/modelmesh-runtime-adapter-develop:latest "$@"
"${DOCKER_USER}/modelmesh-runtime-adapter-develop:${IMAGE_TAG}" "$@"