fixes for dolt Docker images and ORM integration tests (#4871)

This commit is contained in:
jennifersp
2022-11-28 14:08:36 -08:00
committed by GitHub
parent 7c51dd0286
commit 4fd39b7309
3 changed files with 6 additions and 5 deletions
+1
View File
@@ -13,4 +13,5 @@ RUN tar zxvf dolt-linux-${BUILDARCH}.tar.gz && \
cp dolt-linux-${BUILDARCH}/bin/dolt /usr/local/bin && \
rm -rf dolt-linux-${BUILDARCH} dolt-linux-${BUILDARCH}.tar.gz
WORKDIR /var/lib/dolt
ENTRYPOINT ["tini", "--", "/usr/local/bin/dolt"]
+1 -1
View File
@@ -58,7 +58,7 @@ get_config_file_path_if_exists() {
FILE_TYPE=$2
if [ -d "$CONFIG_DIR" ]; then
mysql_note "Checking for config provided in $CONFIG_DIR"
number_of_files_found=( `find .$CONFIG_DIR -type f -name "*.$FILE_TYPE" | wc -l` )
number_of_files_found=( `find $CONFIG_DIR -type f -name "*.$FILE_TYPE" | wc -l` )
if [ $number_of_files_found -gt 1 ]; then
CONFIG_PROVIDED=
mysql_warn "multiple config file found in $CONFIG_DIR, using default config"