diff --git a/docker/build.sh b/docker/build.sh index 6b42e3a4..4d838620 100644 --- a/docker/build.sh +++ b/docker/build.sh @@ -19,11 +19,6 @@ if [ "$1" == "base" ] ; then else rm -rf $BASE/canal.*.tar.gz ; cd $BASE/../ && mvn clean package -Dmaven.test.skip -Denv=release && cd $current_path ; - if [ "$1" == "kafka" ] ; then - cp $BASE/../target/canal-kafka-*.tar.gz $BASE/ - docker build --no-cache -t canal/canal-server $BASE/ - else - cp $BASE/../target/canal.deployer-*.tar.gz $BASE/ - docker build --no-cache -t canal/canal-server $BASE/ - fi + cp $BASE/../target/canal.deployer-*.tar.gz $BASE/ + docker build --no-cache -t canal/canal-server $BASE/ fi diff --git a/docker/run.sh b/docker/run.sh index 28f32411..7dbdb682 100644 --- a/docker/run.sh +++ b/docker/run.sh @@ -87,6 +87,6 @@ done MEMORY="-m 4096m" LOCALHOST=`getMyIp` -cmd="docker run -it -h $LOCALHOST $CONFIG --name=canal-server $VOLUMNS $NET_MODE $PORTS $MEMORY canal/canal-server" +cmd="docker run -d -it -h $LOCALHOST $CONFIG --name=canal-server $VOLUMNS $NET_MODE $PORTS $MEMORY canal/canal-server" echo $cmd eval $cmd diff --git a/parse/src/main/java/com/alibaba/otter/canal/parse/inbound/mysql/tsdb/DatabaseTableMeta.java b/parse/src/main/java/com/alibaba/otter/canal/parse/inbound/mysql/tsdb/DatabaseTableMeta.java index 033dcae5..953cca5d 100644 --- a/parse/src/main/java/com/alibaba/otter/canal/parse/inbound/mysql/tsdb/DatabaseTableMeta.java +++ b/parse/src/main/java/com/alibaba/otter/canal/parse/inbound/mysql/tsdb/DatabaseTableMeta.java @@ -529,9 +529,10 @@ public class DatabaseTableMeta implements TableMetaTSDB { return false; } - if (!StringUtils.equalsIgnoreCase(sourceField.getDefaultValue(), targetField.getDefaultValue())) { - return false; - } + // if (!StringUtils.equalsIgnoreCase(sourceField.getDefaultValue(), + // targetField.getDefaultValue())) { + // return false; + // } if (sourceField.isNullable() != targetField.isNullable()) { return false;