mirror of
https://github.com/qurator-spk/ocrd-galley.git
synced 2025-06-08 22:29:56 +02:00
🧹 Use GIT_COMMIT, not DRONE_COMMIT
This commit is contained in:
parent
bcf13a69c3
commit
435c88c5e1
15 changed files with 27 additions and 101 deletions
74
.drone.star
74
.drone.star
|
@ -1,74 +0,0 @@
|
||||||
def main(ctx):
|
|
||||||
tags = [ctx.build.commit]
|
|
||||||
|
|
||||||
if ctx.build.event == "tag":
|
|
||||||
name = "release"
|
|
||||||
elif ctx.build.branch == "master":
|
|
||||||
name = "master"
|
|
||||||
tags.append("latest")
|
|
||||||
else:
|
|
||||||
return
|
|
||||||
|
|
||||||
return [
|
|
||||||
{
|
|
||||||
"kind": "pipeline",
|
|
||||||
"name": name,
|
|
||||||
"steps": [
|
|
||||||
{
|
|
||||||
"name": "prepare data",
|
|
||||||
"image": "alpine",
|
|
||||||
"commands": [
|
|
||||||
"apk update && apk add bash curl",
|
|
||||||
"FORCE_DOWNLOAD=y ./build-tmp-XXX"
|
|
||||||
]
|
|
||||||
},
|
|
||||||
# We can't glob and have to add here manually...
|
|
||||||
step_for(ctx, "core", tags),
|
|
||||||
step_for(ctx, "core-cuda10.0", tags),
|
|
||||||
step_for(ctx, "core-cuda10.1", tags),
|
|
||||||
|
|
||||||
step_for(ctx, "dinglehopper", tags),
|
|
||||||
step_for(ctx, "ocrd_calamari", tags),
|
|
||||||
step_for(ctx, "ocrd_calamari03", tags),
|
|
||||||
step_for(ctx, "ocrd_cis", tags),
|
|
||||||
step_for(ctx, "ocrd_fileformat", tags),
|
|
||||||
step_for(ctx, "ocrd_olena", tags),
|
|
||||||
step_for(ctx, "ocrd_segment", tags),
|
|
||||||
step_for(ctx, "ocrd_tesserocr", tags),
|
|
||||||
step_for(ctx, "ocrd_wrap", tags),
|
|
||||||
step_for(ctx, "sbb_binarization", tags),
|
|
||||||
step_for(ctx, "sbb_textline_detector", tags),
|
|
||||||
step_for(ctx, "eynollah", tags),
|
|
||||||
step_for(ctx, "ocrd_anybaseocr", tags),
|
|
||||||
{
|
|
||||||
"name": "notify",
|
|
||||||
"image": "drillster/drone-email",
|
|
||||||
"settings": {
|
|
||||||
"host": "172.17.0.1",
|
|
||||||
"port": "25",
|
|
||||||
"from": "drone@ci.moegen-wir.net",
|
|
||||||
},
|
|
||||||
"when": {
|
|
||||||
"status": [ "success", "failure" ]
|
|
||||||
}
|
|
||||||
}
|
|
||||||
]
|
|
||||||
}
|
|
||||||
]
|
|
||||||
|
|
||||||
|
|
||||||
def step_for(ctx, sub_image, tags):
|
|
||||||
return {
|
|
||||||
"name": "build %s" % sub_image,
|
|
||||||
"image": "plugins/docker",
|
|
||||||
"settings": {
|
|
||||||
"build_args": [
|
|
||||||
"DRONE_COMMIT=%s" % ctx.build.commit,
|
|
||||||
],
|
|
||||||
"tags": tags,
|
|
||||||
"username": { "from_secret": "docker_username" },
|
|
||||||
"password": { "from_secret": "docker_password" },
|
|
||||||
"repo": "quratorspk/ocrd-galley-%s" % sub_image,
|
|
||||||
"dockerfile": "Dockerfile-%s" % sub_image,
|
|
||||||
}
|
|
||||||
}
|
|
2
.github/workflows/build-subimage.yml
vendored
2
.github/workflows/build-subimage.yml
vendored
|
@ -50,7 +50,7 @@ jobs:
|
||||||
context: .
|
context: .
|
||||||
file: Dockerfile-${{ inputs.subimage }}
|
file: Dockerfile-${{ inputs.subimage }}
|
||||||
build-args: |
|
build-args: |
|
||||||
DRONE_COMMIT=sha-${{ github.sha }}
|
GIT_COMMIT=sha-${{ github.sha }}
|
||||||
BUILDKIT_INLINE_CACHE=1
|
BUILDKIT_INLINE_CACHE=1
|
||||||
tags: ${{ steps.meta.outputs.tags }}
|
tags: ${{ steps.meta.outputs.tags }}
|
||||||
push: true
|
push: true
|
||||||
|
|
|
@ -1,5 +1,5 @@
|
||||||
ARG DRONE_COMMIT="latest"
|
ARG GIT_COMMIT="latest"
|
||||||
FROM quratorspk/ocrd-galley-core:$DRONE_COMMIT
|
FROM quratorspk/ocrd-galley-core:$GIT_COMMIT
|
||||||
|
|
||||||
ARG PIP_INSTALL="pip install --no-cache-dir"
|
ARG PIP_INSTALL="pip install --no-cache-dir"
|
||||||
ARG DINGLEHOPPER_COMMIT="dcc10c5"
|
ARG DINGLEHOPPER_COMMIT="dcc10c5"
|
||||||
|
|
|
@ -1,5 +1,5 @@
|
||||||
ARG DRONE_COMMIT="latest"
|
ARG GIT_COMMIT="latest"
|
||||||
FROM quratorspk/ocrd-galley-core-cuda10.0:$DRONE_COMMIT
|
FROM quratorspk/ocrd-galley-core-cuda10.0:$GIT_COMMIT
|
||||||
|
|
||||||
ARG PIP_INSTALL="pip install --no-cache-dir"
|
ARG PIP_INSTALL="pip install --no-cache-dir"
|
||||||
ARG EYNOLLAH_VERSION="0.0.10"
|
ARG EYNOLLAH_VERSION="0.0.10"
|
||||||
|
|
|
@ -1,5 +1,5 @@
|
||||||
ARG DRONE_COMMIT="latest"
|
ARG GIT_COMMIT="latest"
|
||||||
FROM quratorspk/ocrd-galley-core-cuda10.1:$DRONE_COMMIT
|
FROM quratorspk/ocrd-galley-core-cuda10.1:$GIT_COMMIT
|
||||||
|
|
||||||
ARG PIP_INSTALL="pip install --no-cache-dir"
|
ARG PIP_INSTALL="pip install --no-cache-dir"
|
||||||
ARG OCRD_ANYBASEOCR_VERSION="1.8.2"
|
ARG OCRD_ANYBASEOCR_VERSION="1.8.2"
|
||||||
|
|
|
@ -1,5 +1,5 @@
|
||||||
ARG DRONE_COMMIT="latest"
|
ARG GIT_COMMIT="latest"
|
||||||
FROM quratorspk/ocrd-galley-core-cuda10.1:$DRONE_COMMIT
|
FROM quratorspk/ocrd-galley-core-cuda10.1:$GIT_COMMIT
|
||||||
|
|
||||||
|
|
||||||
# XXX https://github.com/OCR-D/core/issues/642
|
# XXX https://github.com/OCR-D/core/issues/642
|
||||||
|
|
|
@ -1,5 +1,5 @@
|
||||||
ARG DRONE_COMMIT="latest"
|
ARG GIT_COMMIT="latest"
|
||||||
FROM quratorspk/ocrd-galley-core-cuda10.0:$DRONE_COMMIT
|
FROM quratorspk/ocrd-galley-core-cuda10.0:$GIT_COMMIT
|
||||||
|
|
||||||
ARG PIP_INSTALL="pip install --no-cache-dir"
|
ARG PIP_INSTALL="pip install --no-cache-dir"
|
||||||
|
|
||||||
|
|
|
@ -1,5 +1,5 @@
|
||||||
ARG DRONE_COMMIT="latest"
|
ARG GIT_COMMIT="latest"
|
||||||
FROM quratorspk/ocrd-galley-core:$DRONE_COMMIT
|
FROM quratorspk/ocrd-galley-core:$GIT_COMMIT
|
||||||
|
|
||||||
ARG PIP_INSTALL="pip install --no-cache-dir"
|
ARG PIP_INSTALL="pip install --no-cache-dir"
|
||||||
ARG OCRD_CIS_VERSION="0.1.5"
|
ARG OCRD_CIS_VERSION="0.1.5"
|
||||||
|
|
|
@ -1,5 +1,5 @@
|
||||||
ARG DRONE_COMMIT="latest"
|
ARG GIT_COMMIT="latest"
|
||||||
FROM quratorspk/ocrd-galley-core:$DRONE_COMMIT
|
FROM quratorspk/ocrd-galley-core:$GIT_COMMIT
|
||||||
|
|
||||||
ARG PIP_INSTALL="pip install --no-cache-dir"
|
ARG PIP_INSTALL="pip install --no-cache-dir"
|
||||||
ARG OCRD_FILEFORMAT_VERSION="0.5.0"
|
ARG OCRD_FILEFORMAT_VERSION="0.5.0"
|
||||||
|
|
|
@ -1,5 +1,5 @@
|
||||||
ARG DRONE_COMMIT="latest"
|
ARG GIT_COMMIT="latest"
|
||||||
FROM quratorspk/ocrd-galley-core:$DRONE_COMMIT
|
FROM quratorspk/ocrd-galley-core:$GIT_COMMIT
|
||||||
|
|
||||||
ARG PIP_INSTALL="pip install --no-cache-dir"
|
ARG PIP_INSTALL="pip install --no-cache-dir"
|
||||||
ARG OCRD_OLENA_VERSION="1.3.0"
|
ARG OCRD_OLENA_VERSION="1.3.0"
|
||||||
|
|
|
@ -1,5 +1,5 @@
|
||||||
ARG DRONE_COMMIT="latest"
|
ARG GIT_COMMIT="latest"
|
||||||
FROM quratorspk/ocrd-galley-core:$DRONE_COMMIT
|
FROM quratorspk/ocrd-galley-core:$GIT_COMMIT
|
||||||
|
|
||||||
ARG PIP_INSTALL="pip install --no-cache-dir"
|
ARG PIP_INSTALL="pip install --no-cache-dir"
|
||||||
ARG OCRD_SEGMENT_VERSION="0.1.21"
|
ARG OCRD_SEGMENT_VERSION="0.1.21"
|
||||||
|
|
|
@ -1,5 +1,5 @@
|
||||||
ARG DRONE_COMMIT="latest"
|
ARG GIT_COMMIT="latest"
|
||||||
FROM quratorspk/ocrd-galley-core:$DRONE_COMMIT
|
FROM quratorspk/ocrd-galley-core:$GIT_COMMIT
|
||||||
|
|
||||||
ARG PIP_INSTALL="pip install --no-cache-dir"
|
ARG PIP_INSTALL="pip install --no-cache-dir"
|
||||||
ARG TESSDATA_BEST_VERSION="4.0.0"
|
ARG TESSDATA_BEST_VERSION="4.0.0"
|
||||||
|
|
|
@ -1,5 +1,5 @@
|
||||||
ARG DRONE_COMMIT="latest"
|
ARG GIT_COMMIT="latest"
|
||||||
FROM quratorspk/ocrd-galley-core:$DRONE_COMMIT
|
FROM quratorspk/ocrd-galley-core:$GIT_COMMIT
|
||||||
|
|
||||||
ARG PIP_INSTALL="pip install --no-cache-dir"
|
ARG PIP_INSTALL="pip install --no-cache-dir"
|
||||||
ARG OCRD_WRAP_VERSION="0.1.7"
|
ARG OCRD_WRAP_VERSION="0.1.7"
|
||||||
|
|
|
@ -1,5 +1,5 @@
|
||||||
ARG DRONE_COMMIT="latest"
|
ARG GIT_COMMIT="latest"
|
||||||
FROM quratorspk/ocrd-galley-core-cuda10.0:$DRONE_COMMIT
|
FROM quratorspk/ocrd-galley-core-cuda10.0:$GIT_COMMIT
|
||||||
|
|
||||||
ARG PIP_INSTALL="pip install --no-cache-dir"
|
ARG PIP_INSTALL="pip install --no-cache-dir"
|
||||||
ARG SBB_BINARIZATION_VERSION="0.0.10"
|
ARG SBB_BINARIZATION_VERSION="0.0.10"
|
||||||
|
|
|
@ -1,5 +1,5 @@
|
||||||
ARG DRONE_COMMIT="latest"
|
ARG GIT_COMMIT="latest"
|
||||||
FROM quratorspk/ocrd-galley-core-cuda10.0:$DRONE_COMMIT
|
FROM quratorspk/ocrd-galley-core-cuda10.0:$GIT_COMMIT
|
||||||
|
|
||||||
ARG PIP_INSTALL="pip install --no-cache-dir"
|
ARG PIP_INSTALL="pip install --no-cache-dir"
|
||||||
ARG SBB_TEXTLINE_DETECTOR_COMMIT="c4df3d6"
|
ARG SBB_TEXTLINE_DETECTOR_COMMIT="c4df3d6"
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue