forgejo/docs
32
58
Fork
You've already forked docs
250

Update Docker installation instructions to use v8. Fixes #846 #845

Merged
earl-warren merged 1 commit from yonas/forgejo-docs:yonas-patch-docs-docker into next 2024年09月07日 16:31:54 +02:00
Contributor
Copy link
No description provided.
yonas changed title from (削除) Update Docker installation instructions to use v8 (削除ここまで) to Update Docker installation instructions to use v8. Fixes #846 2024年09月06日 23:36:09 +02:00
Collaborator
Copy link

Preview ready: https://forgejo.codeberg.page/@docs_pull_845/

Preview ready: https://forgejo.codeberg.page/@docs_pull_845/
yonas force-pushed yonas-patch-docs-docker from cfb8788b6b
All checks were successful
pr / preview (pull_request) Successful in 59s
to 39aaa79528
All checks were successful
pr / preview (pull_request) Successful in 57s
2024年09月06日 23:43:05 +02:00 Compare
Author
Contributor
Copy link

Not sure why the preview at https://forgejo.codeberg.page/@docs_pull_845/ didn't pick up my changes.

Not sure why the preview at https://forgejo.codeberg.page/@docs_pull_845/ didn't pick up my changes.
mahlzahn requested changes 2024年09月07日 08:32:51 +02:00
Dismissed
mahlzahn left a comment
Copy link

LGTM. Preview is here on the next tag: https://forgejo.codeberg.page/@docs_pull_845/docs/next/admin/installation-docker/

LGTM. Preview is here on the next tag: https://forgejo.codeberg.page/@docs_pull_845/docs/next/admin/installation-docker/
@ -7,3 +7,3 @@
```shell
docker pull codeberg.org/forgejo/forgejo:7.0.3
docker pull codeberg.org/forgejo/forgejo:8.0.3
Member
Copy link

I suggest removing the .0.3 here, such that by default the latest v8 release is pulled.

I suggest removing the `.0.3` here, such that by default the latest v8 release is pulled.
yonas marked this conversation as resolved
@ -14,3 +14,3 @@
The **7** tag is set to be the latest minor release, starting with **7.0.x**. The **7** tag will then be equal to **7.0.4** when it is released and so on. The **7.0** tag is also set to be the latest patch version release.
The **8** tag is set to be the latest minor release, starting with **8.0.x**. The **8** tag will then be equal to **8.0.4** when it is released and so on. The **8.0** tag is also set to be the latest patch version release.
Upgrading from **X** to **X+1** (for instance from **7** to **8**) requires a [manual operation and human verification](../upgrade/). However it is possible to use the **X** tag (for instance **7**) to get the latest minor release automatically.
Member
Copy link

s/for instance 7/for instance 8/

s/for instance **7**/for instance **8**/
yonas marked this conversation as resolved
yonas force-pushed yonas-patch-docs-docker from 39aaa79528
All checks were successful
pr / preview (pull_request) Successful in 57s
to be2d4d2c8c
All checks were successful
pr / preview (pull_request) Successful in 58s
backport / backport (pull_request) Successful in 6s
push / publish (push) Successful in 6s
2024年09月07日 13:42:54 +02:00 Compare
Author
Contributor
Copy link

Thanks @mahlzahn, I've updated the PR.

Thanks @mahlzahn, I've updated the PR.
Collaborator
Copy link

The backport to v8.0 failed:

The process '/usr/bin/git' failed with exit code 1

To backport manually, run these commands in your terminal:

# Fetch latest updates from GitHub
git fetch
# Create a new working tree
git worktree add .worktrees/backport-v8.0 v8.0
# Navigate to the new working tree
cd .worktrees/backport-v8.0
# Create a new branch
git switch --create backport/v8.0/pr-845
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x --mainline 1 be2d4d2c8cd562168ea32285e237b95ffc71294a
# Push it to GitHub
git push --set-upstream origin backport/v8.0/pr-845
# Go back to the original working tree
cd ../..
# Delete the working tree
git worktree remove .worktrees/backport-v8.0

Then, create a pull request where the base branch is v8.0 and the compare/head branch is backport/v8.0/pr-845.

The backport to `v8.0` failed: ``` The process '/usr/bin/git' failed with exit code 1 ``` To backport manually, run these commands in your terminal: ```bash # Fetch latest updates from GitHub git fetch # Create a new working tree git worktree add .worktrees/backport-v8.0 v8.0 # Navigate to the new working tree cd .worktrees/backport-v8.0 # Create a new branch git switch --create backport/v8.0/pr-845 # Cherry-pick the merged commit of this pull request and resolve the conflicts git cherry-pick -x --mainline 1 be2d4d2c8cd562168ea32285e237b95ffc71294a # Push it to GitHub git push --set-upstream origin backport/v8.0/pr-845 # Go back to the original working tree cd ../.. # Delete the working tree git worktree remove .worktrees/backport-v8.0 ``` Then, create a pull request where the `base` branch is `v8.0` and the `compare`/`head` branch is `backport/v8.0/pr-845`.

Thanks @yonas! Somehow, the automatic backport to v8 wasn't working (that would make the documentation of latest). Do you want to create a new PR following the instructions from the bot above?

Thanks @yonas! Somehow, the automatic backport to v8 wasn't working (that would make the documentation of latest). Do you want to create a new PR following the instructions from the bot above?
Author
Contributor
Copy link

@mahlzahn The commands don't work for me. Perhaps someone can help us figure out why the automatic backport failed.

@mahlzahn The commands don't work for me. Perhaps someone can help us figure out why the automatic backport failed.

There is a merge conflict, because #820 wasn’t backported. Once #848 is merged, there shouldn’t be any merge conflict anymore.

There is a merge conflict, because #820 wasn’t backported. Once #848 is merged, there shouldn’t be any merge conflict anymore.
yonas deleted branch yonas-patch-docs-docker 2024年09月08日 19:24:15 +02:00
Sign in to join this conversation.
No reviewers
Labels
Clear labels
404
Broken links or missing content
backport/v1.19
Changes which should be backported to the v1.19 docs

Archived

backport/v1.20
Changes which should be backported to the v1.20 docs

Archived

backport/v1.21
Changes which should be backported to the v1.21 docs

Archived

backport/v10.0
Automated backport to v10.0

Archived

backport/v11.0
Automated backport to v11.0
backport/v12.0
Automated backport to v12.0

Archived

backport/v13.0
Automated backport to v13.0

Archived

backport/v14.0
Automated backport to v14.0

Archived

backport/v15.0
Automated backport to v15.0
backport/v16.0
Automated backport to v16.0
backport/v7.0
Automated backport to the v7.0 docs

Archived

backport/v8.0
Automated backport to the v8.0 docs

Archived

backport/v9.0
Automated backport to the v9.0 docs

Archived

good first issue
This issue is suitable for "drive-by contributors" wanting to contribute for the first time, and fixing it should be straightforward.
meta
Tooling and processes for maintaining the docs
new docs
Content to be added to the documentation

Archived

User research - Accessibility
Requires input about accessibility features, likely involves user testing.
User research - Blocked
Do not pick as-is! We are happy if you can help, but please coordinate with ongoing redesign in this area.
User research - Community
Community features, such as discovering other people's work or otherwise feeling welcome on a Forgejo instance.
User research - Config (instance)
Instance-wide configuration, authentication and other admin-only needs.
User research - Errors
How to deal with errors in the application and write helpful error messages.
User research - Filters
How filter and search is being worked with.
User research - Future backlog
The issue might be inspiring for future design work.
User research - Git workflow
AGit, fork-based and new Git workflow, PR creation etc
User research - Labels
Active research about Labels
User research - Moderation
Moderation Featuers for Admins are undergoing active User Research
User research - Needs input
Use this label to let the User Research team know their input is requested.
User research - Notifications/Dashboard
Research on how users should know what to do next.
User research - Rendering
Text rendering, markup languages etc
User research - Repo creation
Active research about the New Repo dialog.
User research - Repo units
The repo sections, disabling them and the "Add more" button.
User research - Security
User research - Settings (in-app)
How to structure in-app settings in the future?
Milestone
Clear milestone
No items
No milestone
Projects
Clear projects
No items
No project
Assignees
Clear assignees
No assignees
3 participants
Notifications
Due date
The due date is invalid or out of range. Please use the format "yyyy-mm-dd".

No due date set.

Dependencies

No dependencies set.

Reference
forgejo/docs!845
Reference in a new issue
forgejo/docs
No description provided.
Delete branch "yonas/forgejo-docs:yonas-patch-docs-docker"

Deleting a branch is permanent. Although the deleted branch may continue to exist for a short time before it actually gets removed, it CANNOT be undone in most cases. Continue?