Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 9 additions & 2 deletions .github/workflows/docker-build-push-dev.yml
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ jobs:
echo
echo "Render deploy requested"

- name: Log in to GHCR
- name: Log in to GHCR (personal)
uses: docker/login-action@v4
with:
registry: ghcr.io
Expand All @@ -64,5 +64,12 @@ jobs:
- name: Push :dev to personal GHCR
run: make docker-push-dev-ghcr-personal

- name: Push :dev to org GHCR
- name: Log in to GHCR (Interchouette / ITC)
uses: docker/login-action@v4
with:
registry: ghcr.io
username: ${{ secrets.GHCR_USERNAME_ITC }}
password: ${{ secrets.GHCR_PAT_ITC }}

- name: Push :dev to ghcr.io/interchouette and interchouette-itc
run: make docker-push-dev-ghcr-itc
12 changes: 10 additions & 2 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -110,7 +110,7 @@ jobs:
echo
echo "Render deploy requested"

- name: Log in to GHCR
- name: Log in to GHCR (personal)
uses: docker/login-action@v4
with:
registry: ghcr.io
Expand All @@ -120,7 +120,14 @@ jobs:
- name: Push to personal GHCR
run: make docker-push-release-ghcr-personal APP_VERSION=${{ needs.validate.outputs.version }}

- name: Push to org GHCR
- name: Log in to GHCR (Interchouette / ITC)
uses: docker/login-action@v4
with:
registry: ghcr.io
username: ${{ secrets.GHCR_USERNAME_ITC }}
password: ${{ secrets.GHCR_PAT_ITC }}

- name: Push to ghcr.io/interchouette and interchouette-itc
run: make docker-push-release-ghcr-itc APP_VERSION=${{ needs.validate.outputs.version }}

summary:
Expand All @@ -134,6 +141,7 @@ jobs:
V="${{ needs.validate.outputs.version }}"
echo "Pushed interchouette/evaluator:${V} and :latest"
echo "Pushed ghcr.io/groussac/evaluator:${V} and :latest"
echo "Pushed ghcr.io/interchouette/evaluator:${V} and :latest"
echo "Pushed ghcr.io/interchouette-itc/evaluator:${V} and :latest"
echo "Attached release binaries: evaluator, evaluator-mcp (linux glibc)"
echo "Image contents: Angular SPA + Nest + Node serve|evaluate|batch + Chromium + Rust CLI/MCP"
Expand Down
9 changes: 9 additions & 0 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@
APP_NAME ?= evaluator
HUB_IMAGE ?= interchouette/evaluator
GHCR_PERSONAL_IMAGE ?= ghcr.io/groussac/evaluator
GHCR_WORKER_IMAGE ?= ghcr.io/interchouette/evaluator
GHCR_ORG_IMAGE ?= ghcr.io/interchouette-itc/evaluator
TAG ?= latest
APP_VERSION ?= $(shell node -p "require('./www/package.json').version")
Expand Down Expand Up @@ -126,6 +127,8 @@ docker-build-dev:
-t $(HUB_IMAGE):latest \
-t $(GHCR_PERSONAL_IMAGE):dev \
-t $(GHCR_PERSONAL_IMAGE):latest \
-t $(GHCR_WORKER_IMAGE):dev \
-t $(GHCR_WORKER_IMAGE):latest \
-t $(GHCR_ORG_IMAGE):dev \
-t $(GHCR_ORG_IMAGE):latest \
-f $(DOCKERFILE) \
Expand All @@ -140,6 +143,8 @@ docker-push-dev-ghcr-personal:
docker push $(GHCR_PERSONAL_IMAGE):latest

docker-push-dev-ghcr-itc:
docker push $(GHCR_WORKER_IMAGE):dev
docker push $(GHCR_WORKER_IMAGE):latest
docker push $(GHCR_ORG_IMAGE):dev
docker push $(GHCR_ORG_IMAGE):latest

Expand Down Expand Up @@ -169,8 +174,12 @@ docker-push-release-ghcr-personal:
docker push $(GHCR_PERSONAL_IMAGE):latest

docker-push-release-ghcr-itc:
docker tag $(HUB_IMAGE):$(APP_VERSION) $(GHCR_WORKER_IMAGE):$(APP_VERSION)
docker tag $(HUB_IMAGE):latest $(GHCR_WORKER_IMAGE):latest
docker tag $(HUB_IMAGE):$(APP_VERSION) $(GHCR_ORG_IMAGE):$(APP_VERSION)
docker tag $(HUB_IMAGE):latest $(GHCR_ORG_IMAGE):latest
docker push $(GHCR_WORKER_IMAGE):$(APP_VERSION)
docker push $(GHCR_WORKER_IMAGE):latest
docker push $(GHCR_ORG_IMAGE):$(APP_VERSION)
docker push $(GHCR_ORG_IMAGE):latest

Expand Down
2 changes: 1 addition & 1 deletion docs/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -187,7 +187,7 @@ Images (primary):
- GHCR: `ghcr.io/interchouette-itc/evaluator`
- Personal GHCR (optional): `ghcr.io/groussac/evaluator`

The former Hub mirror `gregoshop/evaluator` is **deprecated**. No separate `evaluator-base`. MCP HTTP is on by default (`ENABLE_MCP=0` to disable).
The former Hub mirror `gregoshop/evaluator` is **deprecated** and is **no longer published**. No separate `evaluator-base`. MCP HTTP is on by default (`ENABLE_MCP=0` to disable).

### Run CI-built `:dev` (preferred locally)

Expand Down