From 9c237e4cad996be5baf1116d8794708bf598c893 Mon Sep 17 00:00:00 2001 From: Ce Gao Date: Sun, 12 Jun 2022 00:43:35 +0800 Subject: [PATCH] fix: Bump version and fix base image (#279) Signed-off-by: Ce Gao --- base-images/build.sh | 6 ++++-- cmd/envd-ssh/main.go | 1 - pkg/types/label.go | 14 ++++++++++++++ 3 files changed, 18 insertions(+), 3 deletions(-) diff --git a/base-images/build.sh b/base-images/build.sh index 479dc9a7e..1aa9db433 100755 --- a/base-images/build.sh +++ b/base-images/build.sh @@ -2,6 +2,8 @@ ROOT_DIR=`dirname $0` +ENVD_VERSION="${ENVD_VERSION:-0.0.1}" + cd ${ROOT_DIR} # ubuntu 22.04 build require moby/buildkit version greater than 0.8.1 if ! docker buildx inspect cuda; then @@ -12,7 +14,7 @@ fi docker run --rm --privileged multiarch/qemu-user-static --reset -p yes docker buildx build --build-arg IMAGE_NAME=docker.io/nvidia/cuda \ - --build-arg ENVD_VERSION=0.0.1 \ + --build-arg ENVD_VERSION=${ENVD_VERSION} \ --build-arg ENVD_SSH_IMAGE=ghcr.io/tensorchord/envd-ssh-from-scratch \ --build-arg HTTP_PROXY=${HTTP_PROXY} \ --build-arg HTTPS_PROXY=${HTTPS_PROXY} \ @@ -20,7 +22,7 @@ docker buildx build --build-arg IMAGE_NAME=docker.io/nvidia/cuda \ -t tensorchord/python:3.8-ubuntu20.04-cuda11.6-cudnn8 \ -f python3.8-ubuntu20.04-cuda11.6.Dockerfile . docker buildx build \ - --build-arg ENVD_VERSION=0.0.1 \ + --build-arg ENVD_VERSION=${ENVD_VERSION} \ --build-arg ENVD_SSH_IMAGE=ghcr.io/tensorchord/envd-ssh-from-scratch \ --build-arg HTTP_PROXY=${HTTP_PROXY} \ --build-arg HTTPS_PROXY=${HTTPS_PROXY} \ diff --git a/cmd/envd-ssh/main.go b/cmd/envd-ssh/main.go index 6a628f080..c65297784 100644 --- a/cmd/envd-ssh/main.go +++ b/cmd/envd-ssh/main.go @@ -31,7 +31,6 @@ import ( ) const ( - envPort = "envd_SSH_PORT" flagDebug = "debug" flagAuthKey = "authorized-keys" flagNoAuth = "no-auth" diff --git a/pkg/types/label.go b/pkg/types/label.go index 0755c9aa2..8bba0b233 100644 --- a/pkg/types/label.go +++ b/pkg/types/label.go @@ -1,3 +1,17 @@ +// Copyright 2022 The envd Authors +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// 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. + package types const (