Skip to content

Commit

Permalink
Fixing links and reference to docker images
Browse files Browse the repository at this point in the history
  • Loading branch information
@Murazaki
Murazaki committed May 18, 2024
1 parent a5201d9 commit 49e1215
Show file tree
Hide file tree
Showing 2 changed files with 16 additions and 16 deletions.
18 changes: 9 additions & 9 deletions .vitepress/config.mjs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -110,15 +110,15 @@ export default defineConfig({
],

socialLinks: [
{ icon: 'github', link: 'https://github.com/pixelfed' },
{ icon: 'discord', link: 'https://discord.gg/MHvDHaSzmc' },
{
icon: {
svg: '<svg width="20" height="20" version="1.1" id="svg161" xmlns="http://www.w3.org/2000/svg" xmlns:svg="http://www.w3.org/2000/svg"> <defs id="defs165" /> <path d="M 10,20 C 4.4772,20 0,15.5228 0,10 0,4.4772 4.4772,0 10,0 15.5228,0 20,4.4772 20,10 20,15.5228 15.5228,20 10,20 Z M 9.206,12.1832 h 1.8344 c 1.728,0 3.1292,-1.364 3.1292,-3.046 0,-1.6824 -1.4008,-3.0464 -3.1292,-3.0464 H 8.3928 c -0.9968,0 -1.8052,0.7868 -1.8052,1.7576 v 6.84 z" fill-rule="evenodd" id="path159" style="stroke-width:0.4" /></svg>'
},
link: 'https://pixelfed.social/@pixelfed'
},
{ icon: 'mastodon', link: 'https://mastodon.social/@pixelfed' },
{ icon: 'github', link: 'https://github.com/pixelfed-glitch/pixelfed' },
{ icon: 'discord', link: 'https://discord.gg/HuZc6jr25X' },
// {
// icon: {
// svg: '<svg width="20" height="20" version="1.1" id="svg161" xmlns="http://www.w3.org/2000/svg" xmlns:svg="http://www.w3.org/2000/svg"> <defs id="defs165" /> <path d="M 10,20 C 4.4772,20 0,15.5228 0,10 0,4.4772 4.4772,0 10,0 15.5228,0 20,4.4772 20,10 20,15.5228 15.5228,20 10,20 Z M 9.206,12.1832 h 1.8344 c 1.728,0 3.1292,-1.364 3.1292,-3.046 0,-1.6824 -1.4008,-3.0464 -3.1292,-3.0464 H 8.3928 c -0.9968,0 -1.8052,0.7868 -1.8052,1.7576 v 6.84 z" fill-rule="evenodd" id="path159" style="stroke-width:0.4" /></svg>'
// },
// link: 'https://pixelfed.social/@pixelfed'
// },
// { icon: 'mastodon', link: 'https://mastodon.social/@pixelfed' },
]
},
locales: {
Expand Down
14 changes: 7 additions & 7 deletions running-pixelfed/docker/migrate/v2.0.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -118,11 +118,11 @@ We hope this will make it much easier to confidently and comfortably run your Pi

### Automatic publishing of Docker images <Badge type="tip" text="Improved" />

Going forward we will automatically build and push Docker images for Pixelfed to ~~both [Docker Hub](https://hub.docker.com/r/pixelfed/pixelfed) and~~ [GitHub Container Registry](https://github.com/pixelfed-glitch/pixelfed/pkgs/container/pixelfed).
Going forward we will automatically build and push Docker images for Pixelfed to both [Docker Hub](https://hub.docker.com/r/pixelfedglitch/pixelfed) and [GitHub Container Registry](https://github.com/pixelfed-glitch/pixelfed/pkgs/container/pixelfed).

We will automatically be pushing all combinations of [our supported Docker runtimes](../runtimes.md) and PHP version (8.1, 8.2 and soon 8.3).
We will be automatically pushing all combinations of [our supported Docker runtimes](../runtimes.md).

Further more, testing Pull Requests has never been easier, as we will also build and push Docker images for all Pull Requests with tag prefix `pr-{ID}` (e.x. `pixelfed/pixelfed:pr-4844-apache-8.2`).
Further more, testing Pull Requests has never been easier, as we will also build and push Docker images for all Pull Requests with tag prefix `{RUNTIME}-pr-{ID}` (e.x. `gcr.io/pixelfed-glitch/pixelfed:apache-pr-4844`).

You can control which Pixelfed release you use via the `DOCKER_APP_RELEASE` key/value pair in your `.env` file.

Expand Down Expand Up @@ -176,9 +176,9 @@ Under ideal conditions, a `docker compose build` can now complete in less than a

### Fork friendly Docker releasing <Badge type="tip" text="New" />

Forks of Pixelfed that have enabled GitHub Actions should *automatically* have the same Docker build + push experience as pixelfed/pixelfed have.
Forks of Pixelfed Glitch that have enabled GitHub Actions should *automatically* have the same Docker build + push experience as pixelfed-glitch/pixelfed have.

The `docker` workflow will by default build + push to the GitHub Container Registry for the project the commit was made to, meaning any downstream projects will not have to fork or modify their `docker` workflow to have a reliable release proccess.
The `docker` workflow will by default build + push to the GitHub Container Registry for the project the commit was made to, meaning any downstream projects will not have to fork or modify their `docker` workflow to have a reliable release process.

Forks can further more set GitHub Actions Project variables `DOCKER_HUB_USERNAME`, `DOCKER_HUB_ORGANISATION`, `DOCKER_HUB_REPO` and `DOCKER_HUB_TOKEN` for automatic pushing of images to Docker Hub as well. Please see the `.github/workflows/docker.yml` file for more information.

Expand Down Expand Up @@ -208,7 +208,7 @@ The new `.env` file for Docker is a bit different from the old one (many new set

```bash
cp .env .env.old
wget -O .env.new https://raw.githubusercontent.com/pixelfed/pixelfed/dev/.env.docker
wget -O .env.new https://raw.githubusercontent.com/pixelfed-glitch/pixelfed/main/.env.docker
```

Then open your old `.env.old` configuration file, and for each of the key/value pairs within it, find and update the key in the new `.env.new` configuration file.
Expand Down Expand Up @@ -256,7 +256,7 @@ git pull origin $release
```

::: info
The `$release` can be any valid git reference like `dev,` `staging`, or a [tagged release](https://github.com/pixelfed-glitch/pixelfed/releases) such as `v0.12.0`.
The `$release` can be any valid git reference like `develop`, `staging`, `latest`, or a [tagged release](https://github.com/pixelfed-glitch/pixelfed/releases) such as `v0.12.0-glitch.1.4.0`.
:::

### 5) Migrate data
Expand Down

0 comments on commit 49e1215

Please sign in to comment.