fix: Fix build.sh (#1072)

* fix: Fix build.sh Signed-off-by: Ce Gao <cegao@tensorchord.ai> * fix: Fix name Signed-off-by: Ce Gao <cegao@tensorchord.ai> Signed-off-by: Ce Gao <cegao@tensorchord.ai>
tensorchord · Oct 21, 2022 · 9faeebe · 9faeebe
1 parent ff30b3a
commit 9faeebe
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/base-images/envd/build.sh b/base-images/envd/build.sh
@@ -18,7 +18,7 @@ set -euo pipefail
 
 ROOT_DIR=`dirname $0`
 
-GIT_TAG_VERSION=$(git describe --tags --abbrev=0 | sed -r 's/[v]+//g') # remove v from version
+GIT_TAG_VERSION=$(git describe --tags --abbrev=0)
 ENVD_VERSION="${ENVD_VERSION:-$GIT_TAG_VERSION}"
 DOCKER_HUB_ORG="${DOCKER_HUB_ORG:-tensorchord}"
 TAG_SUFFIX="${TAG_SUFFIX:-}"
@@ -27,7 +27,7 @@ cd ${ROOT_DIR}
 
 docker buildx build \
     --build-arg ENVD_VERSION=${ENVD_VERSION} \
-    -t ${DOCKER_HUB_ORG}/envd:${ENVD_VERSION} \
+    -t ${DOCKER_HUB_ORG}/envd:${ENVD_VERSION}-rootless \
     --pull --push --platform linux/x86_64,linux/arm64 \
     -f envd-daemonless.Dockerfile ../../
 

diff --git a/base-images/envd/envd-daemonless.Dockerfile b/base-images/envd/envd-daemonless.Dockerfile
@@ -1,4 +1,6 @@
-FROM tensorchord/envd:latest as envd
+ARG ENVD_VERSION
+
+FROM tensorchord/envd-from-scratch:${ENVD_VERSION} as envd
 
 FROM moby/buildkit:v0.10.5-rootless
 COPY --from=envd /usr/bin/envd /usr/bin/envd