From 231b0b094a5264f2518e535f9a3d80a9f991a526 Mon Sep 17 00:00:00 2001 From: Vincent Prins Date: Tue, 4 Jun 2024 14:53:55 +0200 Subject: [PATCH 1/5] Make base tagger start.sh executable --- base/start.sh | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) mode change 100644 => 100755 base/start.sh diff --git a/base/start.sh b/base/start.sh old mode 100644 new mode 100755 index e4c9d23..98bf5d5 --- a/base/start.sh +++ b/base/start.sh @@ -1,10 +1,10 @@ -#!/bin/bash - -# turn on bash's job control -set -m - -# start the webservice -python3 webservice.py & - -# start the tagger worker -python3 tagger_worker.py +#!/bin/bash + +# turn on bash's job control +set -m + +# start the webservice +python3 webservice.py & + +# start the tagger worker +python3 tagger_worker.py From 96617d1c1e2051f39e04df6922e8ce3fb8a9f7b3 Mon Sep 17 00:00:00 2001 From: Vincent Prins Date: Tue, 4 Jun 2024 14:55:54 +0200 Subject: [PATCH 2/5] Make production default compose version --- .env | 5 ++++- docker-compose.yml | 14 +++++++------- 2 files changed, 11 insertions(+), 8 deletions(-) diff --git a/.env b/.env index 6d375bc..05b6f73 100644 --- a/.env +++ b/.env @@ -1,2 +1,5 @@ -# TODO: set the env in a more configurable way. +# Default image version (override using --env-file or -e) +APP_VERSION=latest + +# GaLAHaD-like endpoint CALLBACK_SERVER=http://server:8010/internal/jobs diff --git a/docker-compose.yml b/docker-compose.yml index f8255b4..2b6547a 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -1,7 +1,7 @@ services: # pie (ports: 810x) pie-tdn-1400-1600: - image: instituutnederlandsetaal/taggers-dockerized-pie-tdn-1400-1600:dev + image: instituutnederlandsetaal/taggers-dockerized-pie-tdn-1400-1600:${APP_VERSION} build: context: pie/TDN-1400-1600 environment: @@ -11,7 +11,7 @@ services: - 8100:8080 pie-tdn-1600-1900: - image: instituutnederlandsetaal/taggers-dockerized-pie-tdn-1600-1900:dev + image: instituutnederlandsetaal/taggers-dockerized-pie-tdn-1600-1900:${APP_VERSION} build: context: pie/TDN-1600-1900 environment: @@ -21,7 +21,7 @@ services: - 8101:8080 pie-tdn-all: - image: instituutnederlandsetaal/taggers-dockerized-pie-tdn-all:dev + image: instituutnederlandsetaal/taggers-dockerized-pie-tdn-all:${APP_VERSION} build: context: pie/TDN-ALL environment: @@ -31,7 +31,7 @@ services: - 8102:8080 pie-tdn-bab: - image: instituutnederlandsetaal/taggers-dockerized-pie-tdn-bab:dev + image: instituutnederlandsetaal/taggers-dockerized-pie-tdn-bab:${APP_VERSION} build: context: pie/TDN-BAB environment: @@ -41,7 +41,7 @@ services: - 8103:8080 pie-tdn-clvn: - image: instituutnederlandsetaal/taggers-dockerized-pie-tdn-clvn:dev + image: instituutnederlandsetaal/taggers-dockerized-pie-tdn-clvn:${APP_VERSION} build: context: pie/TDN-CLVN environment: @@ -51,7 +51,7 @@ services: - 8104:8080 pie-tdn-cour: - image: instituutnederlandsetaal/taggers-dockerized-pie-tdn-cour:dev + image: instituutnederlandsetaal/taggers-dockerized-pie-tdn-cour:${APP_VERSION} build: context: pie/TDN-COUR environment: @@ -61,7 +61,7 @@ services: - 8105:8080 pie-tdn-dbnldq: - image: instituutnederlandsetaal/taggers-dockerized-pie-tdn-dbnldq:dev + image: instituutnederlandsetaal/taggers-dockerized-pie-tdn-dbnldq:${APP_VERSION} build: context: pie/TDN-DBNLDQ environment: From b2c1dbbe0e8e19e1d12975f97053683789d0d39f Mon Sep 17 00:00:00 2001 From: Vincent Prins Date: Tue, 4 Jun 2024 16:01:26 +0200 Subject: [PATCH 3/5] Set lineendings to LF --- base/start.sh | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/base/start.sh b/base/start.sh index 98bf5d5..e4c9d23 100755 --- a/base/start.sh +++ b/base/start.sh @@ -1,10 +1,10 @@ -#!/bin/bash - -# turn on bash's job control -set -m - -# start the webservice -python3 webservice.py & - -# start the tagger worker -python3 tagger_worker.py +#!/bin/bash + +# turn on bash's job control +set -m + +# start the webservice +python3 webservice.py & + +# start the tagger worker +python3 tagger_worker.py From 4b0af1d739b988e8c142e41d4f41deedceaa1d6c Mon Sep 17 00:00:00 2001 From: Vincent Prins Date: Tue, 4 Jun 2024 16:09:15 +0200 Subject: [PATCH 4/5] Added deploy script --- deploy.sh | 8 ++++++++ 1 file changed, 8 insertions(+) create mode 100755 deploy.sh diff --git a/deploy.sh b/deploy.sh new file mode 100755 index 0000000..fbe93bf --- /dev/null +++ b/deploy.sh @@ -0,0 +1,8 @@ +git pull | while IFS= read -r line; do printf '[%s git pull] %s\n' "$(date '+%H:%M:%S')" "$line"; done +echo "" +docker compose pull | while IFS= read -r line; do printf '[%s docker compose pull] %s\n' "$(date '+%H:%M:%S')" "$line"; done +echo "" +docker compose up -d | while IFS= read -r line; do printf '[%s docker compose up] %s\n' "$(date '+%H:%M:%S')" "$line"; done +echo "" +yes | docker image prune | while IFS= read -r line; do printf '[%s docker image prune] %s\n' "$(date '+%H:%M:%S')" "$line"; done +echo "" \ No newline at end of file From 2d1eeb9e2abaebbee9952f2b5b2f21202abe0abe Mon Sep 17 00:00:00 2001 From: Vincent Prins Date: Tue, 4 Jun 2024 16:14:19 +0200 Subject: [PATCH 5/5] Release 1.0.1 --- codemeta.json => codemeta-harvest.json | 16 +++++++--------- readme.md | 2 +- 2 files changed, 8 insertions(+), 10 deletions(-) rename codemeta.json => codemeta-harvest.json (90%) diff --git a/codemeta.json b/codemeta-harvest.json similarity index 90% rename from codemeta.json rename to codemeta-harvest.json index 28283dd..c9e749b 100644 --- a/codemeta.json +++ b/codemeta-harvest.json @@ -1,21 +1,19 @@ { "@context": "https://w3id.org/codemeta/3.0", "@type": "SoftwareSourceCode", - "version": "1.0.0", - "dateModified": "2024-06-04", "dateCreated": "2024-06-04", "datePublished": "2024-06-04", "applicationCategory": [ "https://w3id.org/nwo-research-fields#Linguistics", "https://w3id.org/nwo-research-fields#ComputationalLinguisticsAndPhilology", "https://w3id.org/nwo-research-fields#ArtificialIntelligenceExpertSystems", - "https://w3id.org/nwo-research-fields#SoftwareForTheHumanities", - "https://vocabs.dariah.eu/tadirah/en/page/enriching", - "https://vocabs.dariah.eu/tadirah/en/page/posTagging", - "https://vocabs.dariah.eu/tadirah/en/page/tagging", - "https://vocabs.dariah.eu/tadirah/en/page/annotating", - "https://vocabs.dariah.eu/tadirah/en/page/lemmatizing", - "https://vocabs.dariah.eu/tadirah/en/page/machineLearning" + "https://w3id.org/nwo-research-fields#SoftwareForHumanities", + "https://vocabs.dariah.eu/tadirah/enriching", + "https://vocabs.dariah.eu/tadirah/posTagging", + "https://vocabs.dariah.eu/tadirah/tagging", + "https://vocabs.dariah.eu/tadirah/annotating", + "https://vocabs.dariah.eu/tadirah/lemmatizing", + "https://vocabs.dariah.eu/tadirah/machineLearning" ], "author": [ { diff --git a/readme.md b/readme.md index 323934d..009097a 100644 --- a/readme.md +++ b/readme.md @@ -1,4 +1,4 @@ -# galahad-taggers-dockerized (1.0.0) +# galahad-taggers-dockerized (1.0.1) GaLAHaD Taggers Dockerized provides a unified interface for linguistic annotation taggers to be added to GaLAHaD or to be run on their own. Tagger are containerized and can be accessed with an API in order to tag documents. Documents are queued and sent to a callback server once tagged. [![Development images to Docker](https://github.com/INL/galahad-taggers-dockerized/actions/workflows/dev-to-docker.yml/badge.svg)](https://github.com/INL/galahad-taggers-dockerized/actions/workflows/dev-to-docker.yml)