Make dockerfile and fix multitag filter
parent
8728b7d694
commit
72169206f8
|
|
@ -0,0 +1,17 @@
|
|||
FROM frolvlad/alpine-glibc:alpine-3.9_glibc-2.29
|
||||
RUN apk update \
|
||||
&& apk add --no-cache \
|
||||
ca-certificates \
|
||||
git \
|
||||
bash \
|
||||
php php-sqlite3 php-pdo php-pdo_mysql php-json php-pdo_sqlite
|
||||
|
||||
RUN mkdir -p /var/log
|
||||
WORKDIR /main
|
||||
|
||||
COPY . .
|
||||
|
||||
ENV GOPATH=""
|
||||
ENV MNT="/mnt/"
|
||||
ENTRYPOINT ["/bin/bash", "/main/entrypoint.sh"]
|
||||
CMD []
|
||||
|
|
@ -0,0 +1,9 @@
|
|||
#! /bin/bash
|
||||
|
||||
(
|
||||
pushd /main/testdata/mytinytodo*
|
||||
php -S 0.0.0.0:38808
|
||||
kill -9 1
|
||||
) &
|
||||
|
||||
exec /main/exec-todo-server "$@"
|
||||
|
|
@ -103,7 +103,7 @@ func (t *Task) MarshalJSON() ([]byte, error) {
|
|||
"noteText": strings.Join(t.Note, "\n"),
|
||||
"ow": 0,
|
||||
"tags": strings.Join([]string(t.Tags), ", "),
|
||||
"tags_ids": strings.Join([]string(tagsIds), ", "),
|
||||
"tags_ids": strings.Join([]string(tagsIds), ","),
|
||||
"duedate": t.Due.Format(fullFormat),
|
||||
"dueClass": "",
|
||||
"dueStr": t.Due.Format(shortFormat),
|
||||
|
|
|
|||
|
|
@ -106,5 +106,6 @@ function add_task() {
|
|||
}
|
||||
|
||||
if [ "$0" == "$BASH_SOURCE" ]; then
|
||||
echo bash migrate.sh 192.168.0.86:44112 localhost:39909
|
||||
time main "$@"
|
||||
fi
|
||||
|
|
|
|||
Loading…
Reference in New Issue