Compare commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
3b1a13b84d | ||
|
|
cd54847af8 | ||
|
|
9dbbdb5ed2 | ||
|
|
f3c634120c | ||
|
|
ae74d22cde | ||
|
|
4a664e90eb | ||
|
|
13af32f535 |
+2
-2
@@ -5,5 +5,5 @@ TRAEFIK_NETWORK=internal
|
|||||||
TRAEFIK_CERT_RESOLVER=netcup
|
TRAEFIK_CERT_RESOLVER=netcup
|
||||||
|
|
||||||
# Keep these two values paired when deploying a newer published toolbox release.
|
# Keep these two values paired when deploying a newer published toolbox release.
|
||||||
TOOLBOX_RELEASE_VERSION=0.20.0
|
TOOLBOX_RELEASE_VERSION=0.20.2
|
||||||
TOOLBOX_RELEASE_SHA256=450618902a1ee87405da463881e6f51f685691c2081259aff9c25a4aa6fe22ed
|
TOOLBOX_RELEASE_SHA256=66f02f95092ef80b9e49cda91c8401400e2ee1d2c640ab20a3a7810bf265c2c7
|
||||||
|
|||||||
@@ -2,8 +2,8 @@ ARG NGINX_IMAGE=nginxinc/nginx-unprivileged:1.31.3-alpine@sha256:18d67281256ded3
|
|||||||
|
|
||||||
FROM ${NGINX_IMAGE} AS release
|
FROM ${NGINX_IMAGE} AS release
|
||||||
|
|
||||||
ARG TOOLBOX_RELEASE_VERSION=0.20.0
|
ARG TOOLBOX_RELEASE_VERSION=0.20.2
|
||||||
ARG TOOLBOX_RELEASE_SHA256=450618902a1ee87405da463881e6f51f685691c2081259aff9c25a4aa6fe22ed
|
ARG TOOLBOX_RELEASE_SHA256=66f02f95092ef80b9e49cda91c8401400e2ee1d2c640ab20a3a7810bf265c2c7
|
||||||
ARG TOOLBOX_RELEASE_BASE_URL=https://git.add-ideas.de/lotobo/toolbox-portal/releases/download
|
ARG TOOLBOX_RELEASE_BASE_URL=https://git.add-ideas.de/lotobo/toolbox-portal/releases/download
|
||||||
|
|
||||||
RUN set -eu; \
|
RUN set -eu; \
|
||||||
@@ -43,6 +43,7 @@ RUN set -eu; \
|
|||||||
test -f /tmp/toolbox/apps/diff/toolbox-app.json; \
|
test -f /tmp/toolbox/apps/diff/toolbox-app.json; \
|
||||||
test -f /tmp/toolbox/apps/time/toolbox-app.json; \
|
test -f /tmp/toolbox/apps/time/toolbox-app.json; \
|
||||||
test -f /tmp/toolbox/apps/text/toolbox-app.json; \
|
test -f /tmp/toolbox/apps/text/toolbox-app.json; \
|
||||||
|
test -f /tmp/toolbox/apps/translator/toolbox-app.json; \
|
||||||
test -f /tmp/toolbox/apps/unicode/toolbox-app.json; \
|
test -f /tmp/toolbox/apps/unicode/toolbox-app.json; \
|
||||||
test -f /tmp/toolbox/apps/flow/toolbox-app.json; \
|
test -f /tmp/toolbox/apps/flow/toolbox-app.json; \
|
||||||
test -f /tmp/toolbox/apps/subtitle/toolbox-app.json; \
|
test -f /tmp/toolbox/apps/subtitle/toolbox-app.json; \
|
||||||
|
|||||||
@@ -99,7 +99,17 @@ Deploy a fresh clone with:
|
|||||||
```sh
|
```sh
|
||||||
git clone https://git.add-ideas.de/lotobo/toolbox-portal.git
|
git clone https://git.add-ideas.de/lotobo/toolbox-portal.git
|
||||||
cd toolbox-portal
|
cd toolbox-portal
|
||||||
docker compose up -d --build
|
./scripts/deploy-update.sh
|
||||||
|
```
|
||||||
|
|
||||||
|
If you prefer the inline command:
|
||||||
|
|
||||||
|
```sh
|
||||||
|
git fetch origin --tags && \
|
||||||
|
git pull --ff-only origin main && \
|
||||||
|
{ TAG="$(git describe --tags --exact-match 2>/dev/null || git describe --tags --abbrev=0 2>/dev/null || true)"; \
|
||||||
|
if [ -n "$TAG" ]; then echo "$TAG"; else echo "warning: no matching tags found"; fi; } && \
|
||||||
|
docker compose up -d --build && \
|
||||||
docker compose ps
|
docker compose ps
|
||||||
```
|
```
|
||||||
|
|
||||||
|
|||||||
@@ -3,7 +3,7 @@ services:
|
|||||||
build:
|
build:
|
||||||
context: .
|
context: .
|
||||||
dockerfile: Containerfile
|
dockerfile: Containerfile
|
||||||
image: git.add-ideas.de/lotobo/toolbox:0.20.0
|
image: git.add-ideas.de/lotobo/toolbox:0.20.2
|
||||||
restart: unless-stopped
|
restart: unless-stopped
|
||||||
read_only: true
|
read_only: true
|
||||||
ports:
|
ports:
|
||||||
|
|||||||
+3
-3
@@ -6,9 +6,9 @@ services:
|
|||||||
context: .
|
context: .
|
||||||
dockerfile: Containerfile.release
|
dockerfile: Containerfile.release
|
||||||
args:
|
args:
|
||||||
TOOLBOX_RELEASE_VERSION: "${TOOLBOX_RELEASE_VERSION:-0.20.0}"
|
TOOLBOX_RELEASE_VERSION: "${TOOLBOX_RELEASE_VERSION:-0.20.2}"
|
||||||
TOOLBOX_RELEASE_SHA256: "${TOOLBOX_RELEASE_SHA256:-450618902a1ee87405da463881e6f51f685691c2081259aff9c25a4aa6fe22ed}"
|
TOOLBOX_RELEASE_SHA256: "${TOOLBOX_RELEASE_SHA256:-66f02f95092ef80b9e49cda91c8401400e2ee1d2c640ab20a3a7810bf265c2c7}"
|
||||||
image: "git.add-ideas.de/lotobo/toolbox:${TOOLBOX_RELEASE_VERSION:-0.20.0}"
|
image: "git.add-ideas.de/lotobo/toolbox:${TOOLBOX_RELEASE_VERSION:-0.20.2}"
|
||||||
restart: unless-stopped
|
restart: unless-stopped
|
||||||
read_only: true
|
read_only: true
|
||||||
tmpfs:
|
tmpfs:
|
||||||
|
|||||||
@@ -1,7 +1,7 @@
|
|||||||
{
|
{
|
||||||
"$schema": "./toolbox-release-lock.schema.json",
|
"$schema": "./toolbox-release-lock.schema.json",
|
||||||
"schemaVersion": 1,
|
"schemaVersion": 1,
|
||||||
"releaseVersion": "0.20.0",
|
"releaseVersion": "0.20.2",
|
||||||
"portalVersion": "0.2.23",
|
"portalVersion": "0.2.23",
|
||||||
"catalogue": {
|
"catalogue": {
|
||||||
"id": "de.add-ideas.toolbox",
|
"id": "de.add-ideas.toolbox",
|
||||||
@@ -188,6 +188,13 @@
|
|||||||
"sha256": "a1b635278da1baf844051fb0bbfc94022596bb674091c4c39ec164cf34bd5f62",
|
"sha256": "a1b635278da1baf844051fb0bbfc94022596bb674091c4c39ec164cf34bd5f62",
|
||||||
"target": "text"
|
"target": "text"
|
||||||
},
|
},
|
||||||
|
{
|
||||||
|
"id": "de.add-ideas.translator-tools",
|
||||||
|
"version": "0.1.1",
|
||||||
|
"artifact": "https://git.add-ideas.de/lotobo/translator-tools/releases/download/v0.1.1/translator-tools-0.1.1.zip",
|
||||||
|
"sha256": "9ff7a14f7b0730bee327d78d2e25364f53a16afd8b675acb0ad81bee9a1710f4",
|
||||||
|
"target": "translator"
|
||||||
|
},
|
||||||
{
|
{
|
||||||
"id": "de.add-ideas.unicode-tools",
|
"id": "de.add-ideas.unicode-tools",
|
||||||
"version": "0.2.0",
|
"version": "0.2.0",
|
||||||
|
|||||||
@@ -0,0 +1,23 @@
|
|||||||
|
#!/usr/bin/env bash
|
||||||
|
set -euo pipefail
|
||||||
|
|
||||||
|
SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
|
||||||
|
PROJECT_DIR="$(cd "${SCRIPT_DIR}/.." && pwd)"
|
||||||
|
cd "${PROJECT_DIR}"
|
||||||
|
|
||||||
|
git fetch origin --tags
|
||||||
|
git pull --ff-only origin main
|
||||||
|
|
||||||
|
if ! TAG="$(git describe --tags --exact-match 2>/dev/null)"; then
|
||||||
|
TAG="$(git describe --tags --abbrev=0 2>/dev/null || true)"
|
||||||
|
if [ -z "${TAG}" ]; then
|
||||||
|
echo "warning: current commit is untagged and no tagged ancestor was found"
|
||||||
|
else
|
||||||
|
echo "warning: current commit is untagged; nearest tag is ${TAG}"
|
||||||
|
fi
|
||||||
|
else
|
||||||
|
echo "tagged: ${TAG}"
|
||||||
|
fi
|
||||||
|
|
||||||
|
docker compose up -d --build
|
||||||
|
docker compose ps
|
||||||
@@ -53,6 +53,7 @@ const expectedAppTargets = [
|
|||||||
'diff',
|
'diff',
|
||||||
'time',
|
'time',
|
||||||
'text',
|
'text',
|
||||||
|
'translator',
|
||||||
'unicode',
|
'unicode',
|
||||||
'flow',
|
'flow',
|
||||||
'subtitle',
|
'subtitle',
|
||||||
|
|||||||
Reference in New Issue
Block a user