From 0b0e9f295302a9436fd2455f9ad68cc651b5314a Mon Sep 17 00:00:00 2001 From: zadam Date: Sun, 21 Apr 2019 12:48:16 +0200 Subject: [PATCH] from now on, "latest" docker tag won't point to beta releases, closes #476 --- .../a2c75661-f9e2-478f-a69f-6a9409e69997.xml | 399 +++++++----------- bin/build-docker.sh | 2 +- bin/push-docker-image.sh | 7 +- 3 files changed, 166 insertions(+), 242 deletions(-) diff --git a/.idea/dataSources/a2c75661-f9e2-478f-a69f-6a9409e69997.xml b/.idea/dataSources/a2c75661-f9e2-478f-a69f-6a9409e69997.xml index b28d70ee3..9ef2d1595 100644 --- a/.idea/dataSources/a2c75661-f9e2-478f-a69f-6a9409e69997.xml +++ b/.idea/dataSources/a2c75661-f9e2-478f-a69f-6a9409e69997.xml @@ -17,736 +17,657 @@
-
- 1 -
- -
-
-
- 1 -
- -
-
-
-
-
+
+
+
+
+
+
1
- +
1
- - - fts5 - noteId UNINDEXED -title -titleHash UNINDEXED -content -contentHash UNINDEXED - - +
+ 1 TEXT|0s 1 - + 2 TEXT|0s 1 - + 3 TEXT|0s 1 - + 4 INT|0s 1 0 - + 5 TEXT|0s 1 "" - + 1 apiTokenId + 1 - + apiTokenId 1 sqlite_autoindex_api_tokens_1 - + 1 TEXT|0s 1 - + 2 TEXT|0s 1 - + 3 TEXT|0s 1 - + 4 TEXT|0s 1 - + 5 TEXT|0s 1 '' - + 6 INT|0s 1 0 - + 7 TEXT|0s 1 - + 8 TEXT|0s 1 - + 9 INT|0s 1 - + 10 TEXT|0s 1 "" - + 11 int|0s 0 - + 1 attributeId + 1 - + noteId + - + name value + - + name + - + value + - + attributeId 1 sqlite_autoindex_attributes_1 - + 1 TEXT|0s 1 - + 2 TEXT|0s 1 - + 3 TEXT|0s 1 - + 4 INTEGER|0s 1 - + 5 TEXT|0s - + 6 BOOLEAN|0s - + 7 INTEGER|0s 1 0 - + 8 TEXT|0s 1 - + 9 TEXT|0s 1 - + 10 TEXT|0s 1 "" - + 1 branchId + 1 - + noteId parentNoteId + - + noteId + - + parentNoteId + - + branchId 1 sqlite_autoindex_branches_1 - + 1 TEXT|0s 1 - + 2 TEXT|0s - + 3 TEXT|0s - + 4 TEXT|0s 1 - + 1 eventId + 1 - + eventId 1 sqlite_autoindex_event_log_1 - + 1 TEXT|0s 1 - + 2 TEXT|0s 1 - + 3 TEXT|0s 1 - + 4 TEXT|0s 1 - + 5 TEXT|0s 1 "" - + 6 INTEGER|0s 1 0 - + 7 TEXT|0s 1 - + 8 TEXT|0s 1 - + 1 linkId + 1 - + noteId + - + targetNoteId + - + linkId 1 sqlite_autoindex_links_1 - + 1 TEXT|0s 1 - + 2 TEXT|0s NULL - + 3 TEXT|0s 1 "" - + 4 TEXT|0s 1 - + 1 noteId + 1 - + noteId 1 sqlite_autoindex_note_contents_1 - - 1 - 1 - - - 2 - - - 1 - k - 1 - - - k - 1 - sqlite_autoindex_note_fulltext_config_1 - - - 1 - INTEGER|0s - - - 2 - - - 3 - - - 4 - - - 5 - - - 6 - - - id - 1 - - - 1 - INTEGER|0s - - - 2 - BLOB|0s - - - id - 1 - - - 1 - INTEGER|0s - - - 2 - BLOB|0s - - - id - 1 - - - 1 - 1 - - - 2 - 1 - - - 3 - - - 1 - segid -term - 1 - - - segid -term - 1 - sqlite_autoindex_note_fulltext_idx_1 - - + 1 TEXT|0s 1 - + 2 TEXT|0s 1 - + 3 TEXT|0s - + 4 TEXT|0s - + 5 INT|0s 1 0 - + 6 TEXT|0s 1 - + 7 TEXT|0s 1 - + 8 TEXT|0s 1 - + 9 TEXT|0s 1 - + 10 TEXT|0s 1 '' - + 11 TEXT|0s 1 '' - + 12 TEXT|0s 1 "" - + 1 noteRevisionId + 1 - + noteId + - + utcDateModifiedFrom + - + utcDateModifiedTo + - + noteRevisionId 1 sqlite_autoindex_note_revisions_1 - + 1 TEXT|0s 1 - + 2 TEXT|0s 1 "note" - + 3 INT|0s 1 0 - + 4 TEXT|0s 1 'text' - + 5 TEXT|0s 1 'text/html' - + 6 TEXT|0s 1 "" - + 7 INT|0s 1 0 - + 8 TEXT|0s 1 - + 9 TEXT|0s 1 - + 10 TEXT|0s 1 - + 11 TEXT|0s 1 - + 1 noteId + 1 - + noteId 1 sqlite_autoindex_notes_1 - + 1 TEXT|0s 1 - + 2 TEXT|0s - + 3 INTEGER|0s 1 0 - + 4 TEXT|0s 1 "" - + 5 TEXT|0s 1 - + 6 TEXT|0s 1 - + 1 name + 1 - + name 1 sqlite_autoindex_options_1 - + 1 TEXT|0s 1 - + 2 TEXT|0s 1 - + 3 TEXT|0s 1 "" - + 4 TEXT|0s 1 - + 5 INT|0s - + 1 branchId + 1 - + branchId 1 sqlite_autoindex_recent_notes_1 - + 1 TEXT|0s 1 - + 2 TEXT|0s 1 - + 1 sourceId + 1 - + sourceId 1 sqlite_autoindex_source_ids_1 - + 1 text|0s - + 2 text|0s - + 3 text|0s - + 4 int|0s - + 5 text|0s - + 1 - + 2 - + 1 INTEGER|0s 1 1 - + 2 TEXT|0s 1 - + 3 TEXT|0s 1 - + 4 TEXT|0s 1 - + 5 TEXT|0s 1 - + entityName entityId + 1 - + utcSyncDate + - + id 1 diff --git a/bin/build-docker.sh b/bin/build-docker.sh index 44bb545d9..1ab0b7f86 100755 --- a/bin/build-docker.sh +++ b/bin/build-docker.sh @@ -2,4 +2,4 @@ VERSION=`jq -r ".version" package.json` -sudo docker build -t zadam/trilium:latest -t zadam/trilium:$VERSION . \ No newline at end of file +sudo docker build -t zadam/trilium:$VERSION . \ No newline at end of file diff --git a/bin/push-docker-image.sh b/bin/push-docker-image.sh index 83c0dc19c..1da48d2db 100755 --- a/bin/push-docker-image.sh +++ b/bin/push-docker-image.sh @@ -5,5 +5,8 @@ if [[ $# -eq 0 ]] ; then exit 1 fi -sudo docker push zadam/trilium:latest -sudo docker push zadam/trilium:$1 \ No newline at end of file +sudo docker push zadam/trilium:$1 + +if [[ $1 != *"beta"* ]]; then + sudo docker push zadam/trilium:latest +fi