diff --git a/.env b/.env index 17a1fa8678..3ebdaddc01 100644 --- a/.env +++ b/.env @@ -2,7 +2,7 @@ REPO=milvusdb/milvus-distributed-dev ARCH=amd64 UBUNTU=18.04 DATE_VERSION=20210223-113458 -LATEST_DATE_VERSION=latest +LATEST_DATE_VERSION=20210223-113458 MINIO_ADDRESS=minio:9000 PULSAR_ADDRESS=pulsar://pulsar:6650 ETCD_ADDRESS=etcd:2379 diff --git a/.github/workflows/publish-builder.yaml b/.github/workflows/publish-builder.yaml index 812aced6d5..68d244f097 100644 --- a/.github/workflows/publish-builder.yaml +++ b/.github/workflows/publish-builder.yaml @@ -40,7 +40,7 @@ jobs: - name: Docker Pull shell: bash run: | - DATE_VERSION=latest docker-compose pull --ignore-pull-failures ubuntu + docker-compose pull --ignore-pull-failures ubuntu - name: Docker Build shell: bash run: | diff --git a/scripts/devcontainer.sh b/scripts/devcontainer.sh index ab1a24dfd3..21722c4e21 100755 --- a/scripts/devcontainer.sh +++ b/scripts/devcontainer.sh @@ -30,11 +30,13 @@ gid=$(id -g) [ "$uid" -lt 500 ] && uid=501 [ "$gid" -lt 500 ] && gid=$uid -awk 'c&&c--{sub(/^/,"#")} /# Build devcontainer/{c=5} 1' $ROOT_DIR/docker-compose.yml > $ROOT_DIR/docker-compose-devcontainer.yml.tmp - -awk 'c&&c--{sub(/^/,"#")} /# Command/{c=3} 1' $ROOT_DIR/docker-compose-devcontainer.yml.tmp > $ROOT_DIR/docker-compose-devcontainer.yml - -rm $ROOT_DIR/docker-compose-devcontainer.yml.tmp +if [ "${CHECK_BUILDER:-}" == "1" ];then + awk 'c&&c--{sub(/^/,"#")} /# Command/{c=3} 1' $ROOT_DIR/docker-compose.yml > $ROOT_DIR/docker-compose-devcontainer.yml +else + awk 'c&&c--{sub(/^/,"#")} /# Build devcontainer/{c=5} 1' $ROOT_DIR/docker-compose.yml > $ROOT_DIR/docker-compose-devcontainer.yml.tmp + awk 'c&&c--{sub(/^/,"#")} /# Command/{c=3} 1' $ROOT_DIR/docker-compose-devcontainer.yml.tmp > $ROOT_DIR/docker-compose-devcontainer.yml + rm $ROOT_DIR/docker-compose-devcontainer.yml.tmp +fi if [ "${machine}" == "Mac" ];then sed -i '' "s/# user: {{ CURRENT_ID }}/user: \"$uid:$gid\"/g" $ROOT_DIR/docker-compose-devcontainer.yml