Add Docker to devcontainer
Some checks failed
/ release (push) Has been cancelled
testing / backend-checks (push) Has been cancelled
testing / frontend-checks (push) Has been cancelled
testing / test-unit (push) Has been cancelled
testing / test-e2e (push) Has been cancelled
testing / test-remote-cacher (redis) (push) Has been cancelled
testing / test-remote-cacher (valkey) (push) Has been cancelled
testing / test-remote-cacher (garnet) (push) Has been cancelled
testing / test-remote-cacher (redict) (push) Has been cancelled
testing / test-mysql (push) Has been cancelled
testing / test-pgsql (push) Has been cancelled
testing / test-sqlite (push) Has been cancelled
testing / security-check (push) Has been cancelled
Some checks failed
/ release (push) Has been cancelled
testing / backend-checks (push) Has been cancelled
testing / frontend-checks (push) Has been cancelled
testing / test-unit (push) Has been cancelled
testing / test-e2e (push) Has been cancelled
testing / test-remote-cacher (redis) (push) Has been cancelled
testing / test-remote-cacher (valkey) (push) Has been cancelled
testing / test-remote-cacher (garnet) (push) Has been cancelled
testing / test-remote-cacher (redict) (push) Has been cancelled
testing / test-mysql (push) Has been cancelled
testing / test-pgsql (push) Has been cancelled
testing / test-sqlite (push) Has been cancelled
testing / security-check (push) Has been cancelled
This commit is contained in:
parent
799d99c9b4
commit
8ee04f8297
2 changed files with 24 additions and 8 deletions
|
|
@ -3,15 +3,13 @@
|
||||||
"image": "mcr.microsoft.com/devcontainers/go:1.24-bullseye",
|
"image": "mcr.microsoft.com/devcontainers/go:1.24-bullseye",
|
||||||
"features": {
|
"features": {
|
||||||
// installs nodejs into container
|
// installs nodejs into container
|
||||||
"ghcr.io/devcontainers/features/node:1": {
|
"ghcr.io/devcontainers/features/node:1": {},
|
||||||
"version": "20"
|
|
||||||
},
|
|
||||||
"ghcr.io/devcontainers/features/git-lfs:1.2.3": {},
|
"ghcr.io/devcontainers/features/git-lfs:1.2.3": {},
|
||||||
"ghcr.io/devcontainers-contrib/features/poetry:2": {},
|
"ghcr.io/devcontainers-contrib/features/poetry:2": {},
|
||||||
"ghcr.io/devcontainers/features/python:1": {
|
"ghcr.io/devcontainers/features/python:1": {},
|
||||||
"version": "3.12"
|
"ghcr.io/warrenbuckley/codespace-features/sqlite:1": {},
|
||||||
},
|
"ghcr.io/devcontainers/features/docker-in-docker:2": {},
|
||||||
"ghcr.io/warrenbuckley/codespace-features/sqlite:1": {}
|
"ghcr.io/devcontainers/features/git-lfs:1": {}
|
||||||
},
|
},
|
||||||
"customizations": {
|
"customizations": {
|
||||||
"vscode": {
|
"vscode": {
|
||||||
|
|
|
||||||
|
|
@ -29,6 +29,7 @@ Don't be overwhelmed, commits are very granular... except when they aren't.
|
||||||
- [*Center padlock icon on profile page*](/git724/forgejo/commit/8ce85c11fd0122a7ff5274d982d141637802aa39): Centers vertically *Email privacy* link icon on user profile page.
|
- [*Center padlock icon on profile page*](/git724/forgejo/commit/8ce85c11fd0122a7ff5274d982d141637802aa39): Centers vertically *Email privacy* link icon on user profile page.
|
||||||
- [*Fix footer link margin*](/git724/forgejo/commit/cbdce79d8b2f878e0635ba513a8a27ead59d9888)
|
- [*Fix footer link margin*](/git724/forgejo/commit/cbdce79d8b2f878e0635ba513a8a27ead59d9888)
|
||||||
- [*Privacy policy support*](/git724/forgejo/commit/43b4a57be39a5ae4f520088a8cba81e764d5b89c): Adds a consent checkbox. Also adds a footer link to the privacy policy.
|
- [*Privacy policy support*](/git724/forgejo/commit/43b4a57be39a5ae4f520088a8cba81e764d5b89c): Adds a consent checkbox. Also adds a footer link to the privacy policy.
|
||||||
|
- [*Terms of Service support*](/git724/forgejo/commit/799d99c9b43d508d165b6ff889abfc1eeee121fa): Adds another consent checkbox and footer link.
|
||||||
- [*Tweak version in footer*](/git724/forgejo/commit/2eefc2c68aee4d2b39038fa738b792bd9141f4f0): Shortens software version that's in the footer
|
- [*Tweak version in footer*](/git724/forgejo/commit/2eefc2c68aee4d2b39038fa738b792bd9141f4f0): Shortens software version that's in the footer
|
||||||
- [*Tweak captcha length*](/git724/forgejo/commit/90553f17f358d1b1f2d4e9f1ac67616eb4c8b03e): Makes captcha 4-5 chars long (instead of 6)
|
- [*Tweak captcha length*](/git724/forgejo/commit/90553f17f358d1b1f2d4e9f1ac67616eb4c8b03e): Makes captcha 4-5 chars long (instead of 6)
|
||||||
- [*Make captcha more readable*](/git724/forgejo/commit/403a755a8a3ef689b96a5179ca8279567e8ce473): Makes captcha larger and readable on dark themes.
|
- [*Make captcha more readable*](/git724/forgejo/commit/403a755a8a3ef689b96a5179ca8279567e8ce473): Makes captcha larger and readable on dark themes.
|
||||||
|
|
@ -47,37 +48,54 @@ You can see [all my changes here](/git724/forgejo/commits/branch/v11.0/forgejo/s
|
||||||
|
|
||||||
You should follow the official [*Forgejo Contributor Guide*](https://forgejo.org/docs/next/contributor). However it lacks a few useful things, below you can find.
|
You should follow the official [*Forgejo Contributor Guide*](https://forgejo.org/docs/next/contributor). However it lacks a few useful things, below you can find.
|
||||||
|
|
||||||
|
It's recommended to use the devcontainer.
|
||||||
|
|
||||||
### Building
|
### Building
|
||||||
|
|
||||||
To build, [the official instructions generally suffice](https://forgejo.org/docs/next/contributor/from-source/)
|
To build, [the official instructions generally suffice](https://forgejo.org/docs/next/contributor/from-source/)
|
||||||
|
|
||||||
Build a single image for multiple architectures:
|
Build a single image for multiple architectures:
|
||||||
|
|
||||||
1. Setup: (do this once)
|
1. Setup: (do this once)
|
||||||
|
|
||||||
```bash
|
```bash
|
||||||
docker buildx create --name mybuilder --use
|
docker buildx create --name mybuilder --use
|
||||||
docker buildx inspect --bootstrap
|
docker buildx inspect --bootstrap
|
||||||
docker run --privileged --rm tonistiigi/binfmt --install all
|
docker run --privileged --rm tonistiigi/binfmt --install all
|
||||||
```
|
```
|
||||||
|
|
||||||
2. Build:
|
2. Build:
|
||||||
|
|
||||||
```bash
|
```bash
|
||||||
docker buildx build --platform linux/amd64,linux/arm64 -t user/repo:tag --push .
|
docker buildx build --platform linux/amd64,linux/arm64 -t user/repo:tag --push .
|
||||||
```
|
```
|
||||||
|
|
||||||
Replace the tag. You can add more architectures, if you wish.
|
Replace the tag. You can add more architectures, if you wish.
|
||||||
|
|
||||||
|
### Live reload
|
||||||
|
|
||||||
|
```bash
|
||||||
|
TAGS='sqlite sqlite_unlock_notify' make watch
|
||||||
|
```
|
||||||
|
|
||||||
### Merge
|
### Merge
|
||||||
|
|
||||||
Make sure you checked out the branch to merge to.
|
Make sure you checked out the branch to merge to.
|
||||||
1. ```bash
|
1. ```bash
|
||||||
git remote add upstream https://codeberg.org/forgejo/forgejo.git
|
git remote add upstream https://codeberg.org/forgejo/forgejo.git
|
||||||
```
|
```
|
||||||
|
|
||||||
2. ```bash
|
2. ```bash
|
||||||
git fetch --no-tags upstream
|
git fetch --no-tags upstream
|
||||||
```
|
```
|
||||||
|
|
||||||
3. ```bash
|
3. ```bash
|
||||||
git merge upstream/$BRANCH
|
git merge upstream/$BRANCH
|
||||||
```
|
```
|
||||||
|
|
||||||
### Tag a release
|
### Tag a release
|
||||||
|
|
||||||
```
|
```
|
||||||
git tag $TAG
|
git tag $TAG
|
||||||
git push origin tag $TAG
|
git push origin tag $TAG
|
||||||
```
|
```
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue