Skip to content

Merge staging into main #516

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
vukilelanga merged 4 commits into from
Sep 2, 2026
Merged

Merge staging into main #516

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
f672cd1
chore(*): sync release version 2026.09.02-1 to staging [skip ci]
github-actions[bot] Sep 2, 2026
338b11c
Merge: sync version 2026.09.02-1 to staging [skip ci]
vukilelanga Sep 2, 2026
b84bbbe
ci(*): fix devdocs port on fly
vukilelanga Sep 2, 2026
5e7c20f
Merge pull request #515 from eLifePathways/288-fix-dockerfile-and-port
vukilelanga Sep 2, 2026
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
2 changes: 1 addition & 1 deletion .fly/kotahi-dev-docs.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ app = 'kotahi-dev-docs'
primary_region = 'fra'

[http_service]
internal_port = 80
internal_port = 3000
force_https = true
auto_stop_machines = 'stop'
auto_start_machines = true
Expand Down
2 changes: 1 addition & 1 deletion package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "kotahi",
"version": "2026.09.02-0",
"version": "2026.09.02-1",
"private": true,
"description": "Kotahi - open journals",
"repository": {
Expand Down
2 changes: 1 addition & 1 deletion packages/client/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "kotahi",
"version": "2026.09.02-0",
"version": "2026.09.02-1",
"private": true,
"description": "Kotahi - open journals",
"repository": {
Expand Down
11 changes: 10 additions & 1 deletion packages/devdocs/Dockerfile-production
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,4 +21,13 @@ RUN yarn build

FROM cokoapps/base:24

COPY --from=0 /home/node/app/build /usr/share/nginx/html
WORKDIR /home/node/app

RUN yarn global add serve

COPY --from=0 /home/node/app/build ./build

RUN chown -R node:node .
USER node

CMD ["npx", "serve", "-p", "3000", "./build"]
2 changes: 1 addition & 1 deletion packages/server/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "kotahi",
"version": "2026.09.02-0",
"version": "2026.09.02-1",
"private": true,
"description": "Kotahi - open journals",
"repository": {
Expand Down