Merge pull request 'Point links at git.coffeylabs.org after the move from GitHub' (#5) from fix/links-after-move into main
This commit was merged in pull request #5.
This commit is contained in:
+1
-1
@@ -70,7 +70,7 @@ upgrade migrates its data with no way back, so its version only changes in a
|
|||||||
release of this tool.
|
release of this tool.
|
||||||
|
|
||||||
Binaries for `linux/amd64` and `linux/arm64` and a `SHA256SUMS` file are
|
Binaries for `linux/amd64` and `linux/arm64` and a `SHA256SUMS` file are
|
||||||
attached to every [release](https://github.com/Coffey-Labs/ihasmail-oneshot/releases).
|
attached to every [release](https://git.coffeylabs.org/coffey-labs/ihasmail-oneshot/releases).
|
||||||
|
|
||||||
Every release is built by the [release workflow](.github/workflows/release.yml)
|
Every release is built by the [release workflow](.github/workflows/release.yml)
|
||||||
from a tagged commit on `main`, after the tests and a known-vulnerabilities
|
from a tagged commit on `main`, after the tests and a known-vulnerabilities
|
||||||
|
|||||||
@@ -1,12 +1,12 @@
|
|||||||
# ihasmail-oneshot
|
# ihasmail-oneshot
|
||||||
|
|
||||||
[](https://github.com/Coffey-Labs/ihasmail-oneshot/releases/latest)
|
[](https://git.coffeylabs.org/coffey-labs/ihasmail-oneshot/releases/latest)
|
||||||
[](LICENSE)
|
[](LICENSE)
|
||||||
[](https://docs.ihasmail.org/install/oneshot/)
|
[](https://docs.ihasmail.org/install/oneshot/)
|
||||||
|
|
||||||
**One command that turns a Linux Docker host into a working mail server with
|
**One command that turns a Linux Docker host into a working mail server with
|
||||||
webmail.** It deploys a fresh [Stalwart](https://stalw.art) mail server and a
|
webmail.** It deploys a fresh [Stalwart](https://stalw.art) mail server and a
|
||||||
fresh [ihasmail](https://github.com/Coffey-Labs/ihasmail) webmail, links them
|
fresh [ihasmail](https://git.coffeylabs.org/coffey-labs/ihasmail) webmail, links them
|
||||||
together, gets them certificates, and hands you the administrator password and
|
together, gets them certificates, and hands you the administrator password and
|
||||||
the DNS records to publish.
|
the DNS records to publish.
|
||||||
|
|
||||||
@@ -50,8 +50,8 @@ The full list is in [docs/reference.md](docs/reference.md#requirements).
|
|||||||
|
|
||||||
```bash
|
```bash
|
||||||
ARCH=amd64 # or arm64
|
ARCH=amd64 # or arm64
|
||||||
curl -fsSLO https://github.com/Coffey-Labs/ihasmail-oneshot/releases/latest/download/ihasmail-oneshot-linux-$ARCH.tar.gz
|
curl -fsSLO https://git.coffeylabs.org/coffey-labs/ihasmail-oneshot/releases/download/latest/ihasmail-oneshot-linux-$ARCH.tar.gz
|
||||||
curl -fsSLO https://github.com/Coffey-Labs/ihasmail-oneshot/releases/latest/download/SHA256SUMS
|
curl -fsSLO https://git.coffeylabs.org/coffey-labs/ihasmail-oneshot/releases/download/latest/SHA256SUMS
|
||||||
sha256sum --ignore-missing -c SHA256SUMS
|
sha256sum --ignore-missing -c SHA256SUMS
|
||||||
tar -xzf ihasmail-oneshot-linux-$ARCH.tar.gz
|
tar -xzf ihasmail-oneshot-linux-$ARCH.tar.gz
|
||||||
sudo install -m 0755 ihasmail-oneshot /usr/local/bin/
|
sudo install -m 0755 ihasmail-oneshot /usr/local/bin/
|
||||||
|
|||||||
+1
-1
@@ -39,5 +39,5 @@ Out of scope, and best reported upstream:
|
|||||||
|
|
||||||
- Vulnerabilities in Stalwart itself
|
- Vulnerabilities in Stalwart itself
|
||||||
- Vulnerabilities in ihasmail itself — see
|
- Vulnerabilities in ihasmail itself — see
|
||||||
[its security policy](https://github.com/Coffey-Labs/ihasmail/security/policy)
|
[its security policy](https://git.coffeylabs.org/coffey-labs/ihasmail/src/branch/main/SECURITY.md)
|
||||||
- Vulnerabilities in Caddy or Docker
|
- Vulnerabilities in Caddy or Docker
|
||||||
|
|||||||
@@ -50,7 +50,7 @@ It deploys three containers:
|
|||||||
| Container | Image | Role |
|
| Container | Image | Role |
|
||||||
| --- | --- | --- |
|
| --- | --- | --- |
|
||||||
| **Stalwart** | `stalwartlabs/stalwart` | The mail server: SMTP, IMAP, POP3, JMAP, CalDAV, CardDAV, spam filtering, DKIM. It holds all the mail and all the accounts |
|
| **Stalwart** | `stalwartlabs/stalwart` | The mail server: SMTP, IMAP, POP3, JMAP, CalDAV, CardDAV, spam filtering, DKIM. It holds all the mail and all the accounts |
|
||||||
| **ihasmail** | `ghcr.io/coffey-labs/ihasmail` | The webmail: mail, calendars, contacts, files and filters in the browser, talking to Stalwart over JMAP. It holds nothing but sessions |
|
| **ihasmail** | `registry.coffeylabs.org/coffey-labs/ihasmail` | The webmail: mail, calendars, contacts, files and filters in the browser, talking to Stalwart over JMAP. It holds nothing but sessions |
|
||||||
| **Caddy** | `caddy` | The HTTPS front: certificates and TLS for the webmail and for Stalwart's web side |
|
| **Caddy** | `caddy` | The HTTPS front: certificates and TLS for the webmail and for Stalwart's web side |
|
||||||
|
|
||||||
It has two shapes:
|
It has two shapes:
|
||||||
|
|||||||
+4
-4
@@ -39,8 +39,8 @@ unpack:
|
|||||||
|
|
||||||
```bash
|
```bash
|
||||||
ARCH=amd64 # or arm64
|
ARCH=amd64 # or arm64
|
||||||
curl -fsSLO https://github.com/Coffey-Labs/ihasmail-oneshot/releases/latest/download/ihasmail-oneshot-linux-$ARCH.tar.gz
|
curl -fsSLO https://git.coffeylabs.org/coffey-labs/ihasmail-oneshot/releases/download/latest/ihasmail-oneshot-linux-$ARCH.tar.gz
|
||||||
curl -fsSLO https://github.com/Coffey-Labs/ihasmail-oneshot/releases/latest/download/SHA256SUMS
|
curl -fsSLO https://git.coffeylabs.org/coffey-labs/ihasmail-oneshot/releases/download/latest/SHA256SUMS
|
||||||
sha256sum --ignore-missing -c SHA256SUMS
|
sha256sum --ignore-missing -c SHA256SUMS
|
||||||
tar -xzf ihasmail-oneshot-linux-$ARCH.tar.gz
|
tar -xzf ihasmail-oneshot-linux-$ARCH.tar.gz
|
||||||
sudo install -m 0755 ihasmail-oneshot /usr/local/bin/
|
sudo install -m 0755 ihasmail-oneshot /usr/local/bin/
|
||||||
@@ -57,7 +57,7 @@ same bytes from the same commit.
|
|||||||
With Go 1.26.8 or newer:
|
With Go 1.26.8 or newer:
|
||||||
|
|
||||||
```bash
|
```bash
|
||||||
git clone https://github.com/Coffey-Labs/ihasmail-oneshot.git
|
git clone https://git.coffeylabs.org/coffey-labs/ihasmail-oneshot.git
|
||||||
cd ihasmail-oneshot
|
cd ihasmail-oneshot
|
||||||
go build -o ihasmail-oneshot ./cmd/ihasmail-oneshot
|
go build -o ihasmail-oneshot ./cmd/ihasmail-oneshot
|
||||||
```
|
```
|
||||||
@@ -168,7 +168,7 @@ docker compose pull && docker compose up -d
|
|||||||
|
|
||||||
- **ihasmail** is safe to move to any newer release that supports your
|
- **ihasmail** is safe to move to any newer release that supports your
|
||||||
Stalwart version. Its release notes say which. The newest is on
|
Stalwart version. Its release notes say which. The newest is on
|
||||||
[ihasmail's releases](https://github.com/Coffey-Labs/ihasmail/releases); its
|
[ihasmail's releases](https://git.coffeylabs.org/coffey-labs/ihasmail/releases); its
|
||||||
image tag is the version with `+` written as `-`, e.g. `2026.9.13-pr344`.
|
image tag is the version with `+` written as `-`, e.g. `2026.9.13-pr344`.
|
||||||
- **Stalwart**: read its upgrade notes before changing versions. Check that the
|
- **Stalwart**: read its upgrade notes before changing versions. Check that the
|
||||||
ihasmail version you run supports the new Stalwart release first, since
|
ihasmail version you run supports the new Stalwart release first, since
|
||||||
|
|||||||
@@ -37,7 +37,7 @@ const (
|
|||||||
DefaultStalwartImage = "stalwartlabs/stalwart:v0.16.22"
|
DefaultStalwartImage = "stalwartlabs/stalwart:v0.16.22"
|
||||||
DefaultCaddyImage = "caddy:2.11.4"
|
DefaultCaddyImage = "caddy:2.11.4"
|
||||||
|
|
||||||
IhasmailRepository = "ghcr.io/coffey-labs/ihasmail"
|
IhasmailRepository = "registry.coffeylabs.org/coffey-labs/ihasmail"
|
||||||
// NewestIhasmail is the default --ihasmail-image. Only full releases move
|
// NewestIhasmail is the default --ihasmail-image. Only full releases move
|
||||||
// this tag; prereleases never do.
|
// this tag; prereleases never do.
|
||||||
NewestIhasmail = IhasmailRepository + ":latest"
|
NewestIhasmail = IhasmailRepository + ":latest"
|
||||||
|
|||||||
@@ -104,17 +104,17 @@ func TestIhasmailFollowsTheNewestReleaseUnlessNamed(t *testing.T) {
|
|||||||
if err != nil {
|
if err != nil {
|
||||||
t.Fatal(err)
|
t.Fatal(err)
|
||||||
}
|
}
|
||||||
if !p.FollowsNewestIhasmail() || p.IhasmailImage != "ghcr.io/coffey-labs/ihasmail:latest" {
|
if !p.FollowsNewestIhasmail() || p.IhasmailImage != "registry.coffeylabs.org/coffey-labs/ihasmail:latest" {
|
||||||
t.Errorf("default ihasmail image %q", p.IhasmailImage)
|
t.Errorf("default ihasmail image %q", p.IhasmailImage)
|
||||||
}
|
}
|
||||||
named, err := Options{Domain: "example.com", IhasmailImage: "ghcr.io/coffey-labs/ihasmail:2026.9.13-pr344"}.Validate()
|
named, err := Options{Domain: "example.com", IhasmailImage: "registry.coffeylabs.org/coffey-labs/ihasmail:2026.9.13-pr344"}.Validate()
|
||||||
if err != nil {
|
if err != nil {
|
||||||
t.Fatal(err)
|
t.Fatal(err)
|
||||||
}
|
}
|
||||||
if named.FollowsNewestIhasmail() {
|
if named.FollowsNewestIhasmail() {
|
||||||
t.Error("a named image is treated as the newest release")
|
t.Error("a named image is treated as the newest release")
|
||||||
}
|
}
|
||||||
byDigest := "ghcr.io/coffey-labs/ihasmail@sha256:" + strings.Repeat("a", 64)
|
byDigest := "registry.coffeylabs.org/coffey-labs/ihasmail@sha256:" + strings.Repeat("a", 64)
|
||||||
if _, err := (Options{Domain: "example.com", IhasmailImage: byDigest}).Validate(); err != nil {
|
if _, err := (Options{Domain: "example.com", IhasmailImage: byDigest}).Validate(); err != nil {
|
||||||
t.Errorf("a by-digest image is refused: %v", err)
|
t.Errorf("a by-digest image is refused: %v", err)
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -66,7 +66,7 @@ func envValue(env, name string) string {
|
|||||||
}
|
}
|
||||||
|
|
||||||
// RepoDigest is an image's by-digest reference in one repository, e.g.
|
// RepoDigest is an image's by-digest reference in one repository, e.g.
|
||||||
// ghcr.io/coffey-labs/ihasmail@sha256:..., which names exactly that image for
|
// registry.coffeylabs.org/coffey-labs/ihasmail@sha256:..., which names exactly that image for
|
||||||
// as long as the registry keeps it.
|
// as long as the registry keeps it.
|
||||||
func RepoDigest(ctx context.Context, image, repository string) (string, error) {
|
func RepoDigest(ctx context.Context, image, repository string) (string, error) {
|
||||||
out, err := Output(ctx, "image", "inspect", "--format", "{{range .RepoDigests}}{{println .}}{{end}}", image)
|
out, err := Output(ctx, "image", "inspect", "--format", "{{range .RepoDigests}}{{println .}}{{end}}", image)
|
||||||
|
|||||||
Reference in New Issue
Block a user