-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Fix Dockerfile always building upon dev tag
And rename the version tags evironment vars to simply VERSION
- Loading branch information
Showing
24 changed files
with
100 additions
and
100 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,5 +1,5 @@ | ||
# Default image version (override using --env-file or -e) | ||
APP_VERSION=latest | ||
VERSION=test | ||
|
||
# GaLAHaD-like endpoint | ||
CALLBACK_SERVER=http://server:8010/internal/jobs |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -22,4 +22,4 @@ jobs: | |
- name: Build and push | ||
run: ./buildandpushall.sh | ||
env: | ||
VERSION_LABEL: dev | ||
VERSION: dev |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -23,4 +23,4 @@ jobs: | |
- name: Build and push | ||
run: ./buildandpushall.sh | ||
env: | ||
VERSION_LABEL: latest | ||
VERSION: latest |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,29 +1,29 @@ | ||
# Set the default label | ||
: ${VERSION_LABEL:=dev} | ||
: ${VERSION:=latest} | ||
|
||
echo "Will build taggers with version <$VERSION_LABEL>. Set VERSION_LABEL to override this." | ||
echo "Will build taggers with version <$VERSION>. Set VERSION to override this." | ||
|
||
# Base image | ||
docker build -t instituutnederlandsetaal/taggers-dockerized-base:$VERSION_LABEL base | ||
docker build --build-arg VERSION=$VERSION -t instituutnederlandsetaal/taggers-dockerized-base:$VERSION base | ||
|
||
# PIE | ||
docker build -t instituutnederlandsetaal/taggers-dockerized-pie-base:$VERSION_LABEL pie/base | ||
docker build -t instituutnederlandsetaal/taggers-dockerized-pie-tdn-1400-1600:$VERSION_LABEL pie/TDN-1400-1600 | ||
docker build -t instituutnederlandsetaal/taggers-dockerized-pie-tdn-1600-1900:$VERSION_LABEL pie/TDN-1600-1900 | ||
docker build -t instituutnederlandsetaal/taggers-dockerized-pie-tdn-all:$VERSION_LABEL pie/TDN-ALL | ||
docker build -t instituutnederlandsetaal/taggers-dockerized-pie-tdn-bab:$VERSION_LABEL pie/TDN-BAB | ||
docker build -t instituutnederlandsetaal/taggers-dockerized-pie-tdn-clvn:$VERSION_LABEL pie/TDN-CLVN | ||
docker build -t instituutnederlandsetaal/taggers-dockerized-pie-tdn-cour:$VERSION_LABEL pie/TDN-COUR | ||
docker build -t instituutnederlandsetaal/taggers-dockerized-pie-tdn-dbnldq:$VERSION_LABEL pie/TDN-DBNLDQ | ||
# docker build --build-arg VERSION=$VERSION -t instituutnederlandsetaal/taggers-dockerized-pie-base:$VERSION pie/base | ||
# docker build --build-arg VERSION=$VERSION -t instituutnederlandsetaal/taggers-dockerized-pie-tdn-1400-1600:$VERSION pie/TDN-1400-1600 | ||
# docker build --build-arg VERSION=$VERSION -t instituutnederlandsetaal/taggers-dockerized-pie-tdn-1600-1900:$VERSION pie/TDN-1600-1900 | ||
# docker build --build-arg VERSION=$VERSION -t instituutnederlandsetaal/taggers-dockerized-pie-tdn-all:$VERSION pie/TDN-ALL | ||
# docker build --build-arg VERSION=$VERSION -t instituutnederlandsetaal/taggers-dockerized-pie-tdn-bab:$VERSION pie/TDN-BAB | ||
# docker build --build-arg VERSION=$VERSION -t instituutnederlandsetaal/taggers-dockerized-pie-tdn-clvn:$VERSION pie/TDN-CLVN | ||
# docker build --build-arg VERSION=$VERSION -t instituutnederlandsetaal/taggers-dockerized-pie-tdn-cour:$VERSION pie/TDN-COUR | ||
# docker build --build-arg VERSION=$VERSION -t instituutnederlandsetaal/taggers-dockerized-pie-tdn-dbnldq:$VERSION pie/TDN-DBNLDQ | ||
|
||
# Huggingface | ||
# Commented for now, as we need Git LFS to build these. Perhaps in the future. | ||
# docker build -t instituutnederlandsetaal/taggers-dockerized-hug-base:$VERSION_LABEL huggingface/base | ||
# docker build -t instituutnederlandsetaal/taggers-dockerized-hug-tdn-1400-1600:$VERSION_LABEL huggingface/TDN-1400-1600 | ||
# docker build -t instituutnederlandsetaal/taggers-dockerized-hug-tdn-1600-1900:$VERSION_LABEL huggingface/TDN-1600-1900 | ||
# docker build -t instituutnederlandsetaal/taggers-dockerized-hug-tdn-all:$VERSION_LABEL huggingface/TDN-ALL | ||
# docker build -t instituutnederlandsetaal/taggers-dockerized-hug-tdn-all-enhanced:$VERSION_LABEL huggingface/TDN-ALL-ENHANCED | ||
# docker build -t instituutnederlandsetaal/taggers-dockerized-hug-tdn-bab:$VERSION_LABEL huggingface/TDN-BAB | ||
# docker build -t instituutnederlandsetaal/taggers-dockerized-hug-tdn-clvn:$VERSION_LABEL huggingface/TDN-CLVN | ||
# docker build -t instituutnederlandsetaal/taggers-dockerized-hug-tdn-cour:$VERSION_LABEL huggingface/TDN-COUR | ||
# docker build -t instituutnederlandsetaal/taggers-dockerized-hug-tdn-dbnldq:$VERSION_LABEL huggingface/TDN-DBNLDQ | ||
# docker build --build-arg VERSION=$VERSION -t instituutnederlandsetaal/taggers-dockerized-hug-base:$VERSION huggingface/base | ||
# docker build --build-arg VERSION=$VERSION -t instituutnederlandsetaal/taggers-dockerized-hug-tdn-1400-1600:$VERSION huggingface/TDN-1400-1600 | ||
# docker build --build-arg VERSION=$VERSION -t instituutnederlandsetaal/taggers-dockerized-hug-tdn-1600-1900:$VERSION huggingface/TDN-1600-1900 | ||
# docker build --build-arg VERSION=$VERSION -t instituutnederlandsetaal/taggers-dockerized-hug-tdn-all:$VERSION huggingface/TDN-ALL | ||
# docker build --build-arg VERSION=$VERSION -t instituutnederlandsetaal/taggers-dockerized-hug-tdn-all-enhanced:$VERSION huggingface/TDN-ALL-ENHANCED | ||
# docker build --build-arg VERSION=$VERSION -t instituutnederlandsetaal/taggers-dockerized-hug-tdn-bab:$VERSION huggingface/TDN-BAB | ||
# docker build --build-arg VERSION=$VERSION -t instituutnederlandsetaal/taggers-dockerized-hug-tdn-clvn:$VERSION huggingface/TDN-CLVN | ||
# docker build --build-arg VERSION=$VERSION -t instituutnederlandsetaal/taggers-dockerized-hug-tdn-cour:$VERSION huggingface/TDN-COUR | ||
# docker build --build-arg VERSION=$VERSION -t instituutnederlandsetaal/taggers-dockerized-hug-tdn-dbnldq:$VERSION huggingface/TDN-DBNLDQ |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,26 +1,26 @@ | ||
# Set the default label | ||
: ${VERSION_LABEL:=dev} | ||
: ${VERSION:=dev} | ||
|
||
echo "Will build taggers with version <$VERSION_LABEL>. Set VERSION_LABEL to override this." | ||
echo "Will build taggers with version <$VERSION>. Set VERSION to override this." | ||
|
||
./buildall.sh | ||
|
||
# PIE | ||
docker push instituutnederlandsetaal/taggers-dockerized-pie-tdn-1400-1600:$VERSION_LABEL | ||
docker push instituutnederlandsetaal/taggers-dockerized-pie-tdn-1600-1900:$VERSION_LABEL | ||
docker push instituutnederlandsetaal/taggers-dockerized-pie-tdn-all:$VERSION_LABEL | ||
docker push instituutnederlandsetaal/taggers-dockerized-pie-tdn-bab:$VERSION_LABEL | ||
docker push instituutnederlandsetaal/taggers-dockerized-pie-tdn-clvn:$VERSION_LABEL | ||
docker push instituutnederlandsetaal/taggers-dockerized-pie-tdn-cour:$VERSION_LABEL | ||
docker push instituutnederlandsetaal/taggers-dockerized-pie-tdn-dbnldq:$VERSION_LABEL | ||
docker push instituutnederlandsetaal/taggers-dockerized-pie-tdn-1400-1600:$VERSION | ||
docker push instituutnederlandsetaal/taggers-dockerized-pie-tdn-1600-1900:$VERSION | ||
docker push instituutnederlandsetaal/taggers-dockerized-pie-tdn-all:$VERSION | ||
docker push instituutnederlandsetaal/taggers-dockerized-pie-tdn-bab:$VERSION | ||
docker push instituutnederlandsetaal/taggers-dockerized-pie-tdn-clvn:$VERSION | ||
docker push instituutnederlandsetaal/taggers-dockerized-pie-tdn-cour:$VERSION | ||
docker push instituutnederlandsetaal/taggers-dockerized-pie-tdn-dbnldq:$VERSION | ||
|
||
# Huggingface | ||
# Commented for now, as we need Git LFS to build these. Perhaps in the future. | ||
# docker push instituutnederlandsetaal/taggers-dockerized-hug-tdn-1400-1600:$VERSION_LABEL | ||
# docker push instituutnederlandsetaal/taggers-dockerized-hug-tdn-1600-1900:$VERSION_LABEL | ||
# docker push instituutnederlandsetaal/taggers-dockerized-hug-tdn-all:$VERSION_LABEL | ||
# docker push instituutnederlandsetaal/taggers-dockerized-hug-tdn-all-enhanced:$VERSION_LABEL | ||
# docker push instituutnederlandsetaal/taggers-dockerized-hug-tdn-bab:$VERSION_LABEL | ||
# docker push instituutnederlandsetaal/taggers-dockerized-hug-tdn-clvn:$VERSION_LABEL | ||
# docker push instituutnederlandsetaal/taggers-dockerized-hug-tdn-cour:$VERSION_LABEL | ||
# docker push instituutnederlandsetaal/taggers-dockerized-hug-tdn-dbnldq:$VERSION_LABEL | ||
# docker push instituutnederlandsetaal/taggers-dockerized-hug-tdn-1400-1600:$VERSION | ||
# docker push instituutnederlandsetaal/taggers-dockerized-hug-tdn-1600-1900:$VERSION | ||
# docker push instituutnederlandsetaal/taggers-dockerized-hug-tdn-all:$VERSION | ||
# docker push instituutnederlandsetaal/taggers-dockerized-hug-tdn-all-enhanced:$VERSION | ||
# docker push instituutnederlandsetaal/taggers-dockerized-hug-tdn-bab:$VERSION | ||
# docker push instituutnederlandsetaal/taggers-dockerized-hug-tdn-clvn:$VERSION | ||
# docker push instituutnederlandsetaal/taggers-dockerized-hug-tdn-cour:$VERSION | ||
# docker push instituutnederlandsetaal/taggers-dockerized-hug-tdn-dbnldq:$VERSION |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,4 +1,4 @@ | ||
ARG tag=dev | ||
FROM instituutnederlandsetaal/taggers-dockerized-hug-base:$tag | ||
ARG VERSION=dev | ||
FROM instituutnederlandsetaal/taggers-dockerized-hug-base:$VERSION | ||
|
||
COPY --link . ./ |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,4 +1,4 @@ | ||
ARG tag=dev | ||
FROM instituutnederlandsetaal/taggers-dockerized-hug-base:$tag | ||
ARG VERSION=dev | ||
FROM instituutnederlandsetaal/taggers-dockerized-hug-base:$VERSION | ||
|
||
COPY --link . ./ |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,4 +1,4 @@ | ||
ARG tag=dev | ||
FROM instituutnederlandsetaal/taggers-dockerized-hug-base:$tag | ||
ARG VERSION=dev | ||
FROM instituutnederlandsetaal/taggers-dockerized-hug-base:$VERSION | ||
|
||
COPY --link . ./ |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,4 +1,4 @@ | ||
ARG tag=dev | ||
FROM instituutnederlandsetaal/taggers-dockerized-hug-base:$tag | ||
ARG VERSION=dev | ||
FROM instituutnederlandsetaal/taggers-dockerized-hug-base:$VERSION | ||
|
||
COPY --link . ./ |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,4 +1,4 @@ | ||
ARG tag=dev | ||
FROM instituutnederlandsetaal/taggers-dockerized-hug-base:$tag | ||
ARG VERSION=dev | ||
FROM instituutnederlandsetaal/taggers-dockerized-hug-base:$VERSION | ||
|
||
COPY --link . ./ |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,4 +1,4 @@ | ||
ARG tag=dev | ||
FROM instituutnederlandsetaal/taggers-dockerized-hug-base:$tag | ||
ARG VERSION=dev | ||
FROM instituutnederlandsetaal/taggers-dockerized-hug-base:$VERSION | ||
|
||
COPY --link . ./ |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,4 +1,4 @@ | ||
ARG tag=dev | ||
FROM instituutnederlandsetaal/taggers-dockerized-hug-base:$tag | ||
ARG VERSION=dev | ||
FROM instituutnederlandsetaal/taggers-dockerized-hug-base:$VERSION | ||
|
||
COPY --link . ./ |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,4 +1,4 @@ | ||
ARG tag=dev | ||
FROM instituutnederlandsetaal/taggers-dockerized-hug-base:$tag | ||
ARG VERSION=dev | ||
FROM instituutnederlandsetaal/taggers-dockerized-hug-base:$VERSION | ||
|
||
COPY --link . ./ |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,12 +1,12 @@ | ||
ARG tag=dev | ||
FROM instituutnederlandsetaal/taggers-dockerized-base:$tag | ||
|
||
COPY requirements.sh requirements.txt nltk-download.py ./ | ||
RUN ./requirements.sh && python3 nltk-download.py | ||
|
||
COPY --link process.py / | ||
COPY --link model.config / | ||
COPY --link /lemmatizer ./lemmatizer | ||
COPY --link /lexicon ./lexicon | ||
COPY --link /huggingface/lemmatizer ./huggingface/lemmatizer | ||
COPY --link /huggingface/tagging ./huggingface/tagging | ||
ARG VERSION=dev | ||
FROM instituutnederlandsetaal/taggers-dockerized-base:$VERSION | ||
|
||
COPY requirements.sh requirements.txt nltk-download.py ./ | ||
RUN ./requirements.sh && python3 nltk-download.py | ||
|
||
COPY --link process.py / | ||
COPY --link model.config / | ||
COPY --link /lemmatizer ./lemmatizer | ||
COPY --link /lexicon ./lexicon | ||
COPY --link /huggingface/lemmatizer ./huggingface/lemmatizer | ||
COPY --link /huggingface/tagging ./huggingface/tagging |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,4 +1,4 @@ | ||
ARG tag=dev | ||
FROM instituutnederlandsetaal/taggers-dockerized-pie-base:$tag | ||
ARG VERSION=dev | ||
FROM instituutnederlandsetaal/taggers-dockerized-pie-base:$VERSION | ||
|
||
COPY --link *.tar ./model.tar |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,4 +1,4 @@ | ||
ARG tag=dev | ||
FROM instituutnederlandsetaal/taggers-dockerized-pie-base:$tag | ||
ARG VERSION=dev | ||
FROM instituutnederlandsetaal/taggers-dockerized-pie-base:$VERSION | ||
|
||
COPY --link *.tar ./model.tar |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,4 +1,4 @@ | ||
ARG tag=dev | ||
FROM instituutnederlandsetaal/taggers-dockerized-pie-base:$tag | ||
ARG VERSION=dev | ||
FROM instituutnederlandsetaal/taggers-dockerized-pie-base:test | ||
|
||
COPY --link *.tar ./model.tar |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,4 +1,4 @@ | ||
ARG tag=dev | ||
FROM instituutnederlandsetaal/taggers-dockerized-pie-base:$tag | ||
ARG VERSION=dev | ||
FROM instituutnederlandsetaal/taggers-dockerized-pie-base:$VERSION | ||
|
||
COPY --link *.tar ./model.tar |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,4 +1,4 @@ | ||
ARG tag=dev | ||
FROM instituutnederlandsetaal/taggers-dockerized-pie-base:$tag | ||
ARG VERSION=dev | ||
FROM instituutnederlandsetaal/taggers-dockerized-pie-base:$VERSION | ||
|
||
COPY --link *.tar ./model.tar |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,4 +1,4 @@ | ||
ARG tag=dev | ||
FROM instituutnederlandsetaal/taggers-dockerized-pie-base:$tag | ||
ARG VERSION=dev | ||
FROM instituutnederlandsetaal/taggers-dockerized-pie-base:$VERSION | ||
|
||
COPY --link *.tar ./model.tar |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,4 +1,4 @@ | ||
ARG tag=dev | ||
FROM instituutnederlandsetaal/taggers-dockerized-pie-base:$tag | ||
ARG VERSION=dev | ||
FROM instituutnederlandsetaal/taggers-dockerized-pie-base:$VERSION | ||
|
||
COPY --link *.tar ./model.tar |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters