diff --git a/Dockerfile b/Dockerfile index edce814..dc706bd 100644 --- a/Dockerfile +++ b/Dockerfile @@ -12,6 +12,7 @@ ENV TZ=Asia/Shanghai WORKDIR /app COPY bin/linux_amd64/spark-server /usr/local/bin/spark-server COPY bin/linux_amd64/spark-migrate /usr/local/bin/spark-migrate +COPY bin/linux_amd64/spark-seed /usr/local/bin/spark-seed COPY migrations /app/migrations RUN mkdir -p /app/logs && chown -R spark:spark /app USER spark diff --git a/cmd/migrate/main.go b/cmd/migrate/main.go index 4dfe929..322078d 100644 --- a/cmd/migrate/main.go +++ b/cmd/migrate/main.go @@ -126,6 +126,7 @@ func ignorableDDL(err error) bool { switch me.Number { case 1050, // table already exists 1051, // unknown table + 1054, // unknown column (later migration dropped it; comment-only MODIFY is obsolete) 1060, // duplicate column 1061, // duplicate key name 1091, // can't drop; check that column/key exists