mirror of
https://blitiri.com.ar/repos/chasquid
synced 2025-12-17 14:37:02 +00:00
ci: Rename master branch to main
These days `main` is more common, and I find it more intuitive.
This commit is contained in:
4
.github/workflows/codeql-analysis.yml
vendored
4
.github/workflows/codeql-analysis.yml
vendored
@@ -2,10 +2,10 @@ name: "CodeQL"
|
|||||||
|
|
||||||
on:
|
on:
|
||||||
push:
|
push:
|
||||||
branches: [ "master", "next" ]
|
branches: [ "main", "next" ]
|
||||||
pull_request:
|
pull_request:
|
||||||
# The branches below must be a subset of the branches above
|
# The branches below must be a subset of the branches above
|
||||||
branches: [ "master", "next" ]
|
branches: [ "main", "next" ]
|
||||||
schedule:
|
schedule:
|
||||||
- cron: '29 21 * * 6'
|
- cron: '29 21 * * 6'
|
||||||
|
|
||||||
|
|||||||
8
.github/workflows/docker.yml
vendored
8
.github/workflows/docker.yml
vendored
@@ -2,11 +2,11 @@ name: "docker"
|
|||||||
|
|
||||||
on:
|
on:
|
||||||
push:
|
push:
|
||||||
branches: [ "master", "next" ]
|
branches: [ "main", "next" ]
|
||||||
tags: [ "v*", "test-tag-*" ]
|
tags: [ "v*", "test-tag-*" ]
|
||||||
pull_request:
|
pull_request:
|
||||||
# The branches below must be a subset of the branches above
|
# The branches below must be a subset of the branches above
|
||||||
branches: [ "master", "next" ]
|
branches: [ "main", "next" ]
|
||||||
schedule:
|
schedule:
|
||||||
- cron: '29 21 * * 6'
|
- cron: '29 21 * * 6'
|
||||||
|
|
||||||
@@ -77,7 +77,7 @@ jobs:
|
|||||||
docker tag chasquid index.docker.io/${{ secrets.DOCKER_REGISTRY_USER }}/chasquid:$GITHUB_REF_NAME
|
docker tag chasquid index.docker.io/${{ secrets.DOCKER_REGISTRY_USER }}/chasquid:$GITHUB_REF_NAME
|
||||||
docker push index.docker.io/${{ secrets.DOCKER_REGISTRY_USER }}/chasquid:$GITHUB_REF_NAME
|
docker push index.docker.io/${{ secrets.DOCKER_REGISTRY_USER }}/chasquid:$GITHUB_REF_NAME
|
||||||
- name: Dockerhub tag latest
|
- name: Dockerhub tag latest
|
||||||
if: env.HAS_DOCKER && env.GITHUB_REF_NAME == 'master'
|
if: env.HAS_DOCKER && env.GITHUB_REF_NAME == 'main'
|
||||||
run: |
|
run: |
|
||||||
docker tag chasquid index.docker.io/${{ secrets.DOCKER_REGISTRY_USER }}/chasquid:latest
|
docker tag chasquid index.docker.io/${{ secrets.DOCKER_REGISTRY_USER }}/chasquid:latest
|
||||||
docker push index.docker.io/${{ secrets.DOCKER_REGISTRY_USER }}/chasquid:latest
|
docker push index.docker.io/${{ secrets.DOCKER_REGISTRY_USER }}/chasquid:latest
|
||||||
@@ -96,7 +96,7 @@ jobs:
|
|||||||
docker tag chasquid registry.gitlab.com/albertito/chasquid:$GITHUB_REF_NAME
|
docker tag chasquid registry.gitlab.com/albertito/chasquid:$GITHUB_REF_NAME
|
||||||
docker push registry.gitlab.com/albertito/chasquid:$GITHUB_REF_NAME
|
docker push registry.gitlab.com/albertito/chasquid:$GITHUB_REF_NAME
|
||||||
- name: Gitlab tag latest
|
- name: Gitlab tag latest
|
||||||
if: env.HAS_GITLAB && env.GITHUB_REF_NAME == 'master'
|
if: env.HAS_GITLAB && env.GITHUB_REF_NAME == 'main'
|
||||||
run: |
|
run: |
|
||||||
docker tag chasquid registry.gitlab.com/albertito/chasquid:latest
|
docker tag chasquid registry.gitlab.com/albertito/chasquid:latest
|
||||||
docker push registry.gitlab.com/albertito/chasquid:latest
|
docker push registry.gitlab.com/albertito/chasquid:latest
|
||||||
|
|||||||
4
.github/workflows/gotests.yml
vendored
4
.github/workflows/gotests.yml
vendored
@@ -2,10 +2,10 @@ name: "gotests"
|
|||||||
|
|
||||||
on:
|
on:
|
||||||
push:
|
push:
|
||||||
branches: [ "master", "next" ]
|
branches: [ "main", "next" ]
|
||||||
pull_request:
|
pull_request:
|
||||||
# The branches below must be a subset of the branches above
|
# The branches below must be a subset of the branches above
|
||||||
branches: [ "master", "next" ]
|
branches: [ "main", "next" ]
|
||||||
schedule:
|
schedule:
|
||||||
- cron: '29 21 * * 6'
|
- cron: '29 21 * * 6'
|
||||||
|
|
||||||
|
|||||||
4
.github/workflows/govulncheck.yml
vendored
4
.github/workflows/govulncheck.yml
vendored
@@ -2,10 +2,10 @@ name: "govulncheck"
|
|||||||
|
|
||||||
on:
|
on:
|
||||||
push:
|
push:
|
||||||
branches: [ "master", "next" ]
|
branches: [ "main", "next" ]
|
||||||
pull_request:
|
pull_request:
|
||||||
# The branches below must be a subset of the branches above
|
# The branches below must be a subset of the branches above
|
||||||
branches: [ "master", "next" ]
|
branches: [ "main", "next" ]
|
||||||
schedule:
|
schedule:
|
||||||
- cron: '29 21 * * 6'
|
- cron: '29 21 * * 6'
|
||||||
|
|
||||||
|
|||||||
@@ -9,7 +9,7 @@ It is designed mainly for individuals and small groups.
|
|||||||
It's written in [Go](https://golang.org), and distributed under the
|
It's written in [Go](https://golang.org), and distributed under the
|
||||||
[Apache license 2.0](http://en.wikipedia.org/wiki/Apache_License).
|
[Apache license 2.0](http://en.wikipedia.org/wiki/Apache_License).
|
||||||
|
|
||||||
[](https://github.com/albertito/chasquid/actions)
|
[](https://github.com/albertito/chasquid/actions)
|
||||||
[](https://goreportcard.com/report/github.com/albertito/chasquid)
|
[](https://goreportcard.com/report/github.com/albertito/chasquid)
|
||||||
[](https://coveralls.io/github/albertito/chasquid?branch=next)
|
[](https://coveralls.io/github/albertito/chasquid?branch=next)
|
||||||
[](https://blitiri.com.ar/p/chasquid/)
|
[](https://blitiri.com.ar/p/chasquid/)
|
||||||
|
|||||||
@@ -18,7 +18,7 @@ There are pre-built images at the
|
|||||||
[gitlab registry](https://gitlab.com/albertito/chasquid/container_registry)
|
[gitlab registry](https://gitlab.com/albertito/chasquid/container_registry)
|
||||||
and [dockerhub](https://hub.docker.com/r/albertito/chasquid).
|
and [dockerhub](https://hub.docker.com/r/albertito/chasquid).
|
||||||
They are automatically built, and tagged with the corresponding branch name.
|
They are automatically built, and tagged with the corresponding branch name.
|
||||||
Use the *master* tag for a stable version.
|
Use the *main* tag for a stable version.
|
||||||
|
|
||||||
If, instead, you want to build the image yourself, just run:
|
If, instead, you want to build the image yourself, just run:
|
||||||
|
|
||||||
@@ -32,7 +32,7 @@ $ docker build -t chasquid -f docker/Dockerfile .
|
|||||||
First, pull the image into your target machine:
|
First, pull the image into your target machine:
|
||||||
|
|
||||||
```sh
|
```sh
|
||||||
$ docker pull registry.gitlab.com/albertito/chasquid:master
|
$ docker pull registry.gitlab.com/albertito/chasquid:main
|
||||||
```
|
```
|
||||||
|
|
||||||
You will need a data volume to store persistent data, outside the image. This
|
You will need a data volume to store persistent data, outside the image. This
|
||||||
@@ -48,7 +48,7 @@ To add your first user to the image:
|
|||||||
$ docker run \
|
$ docker run \
|
||||||
--mount source=chasquid-data,target=/data \
|
--mount source=chasquid-data,target=/data \
|
||||||
-it --entrypoint=/add-user.sh \
|
-it --entrypoint=/add-user.sh \
|
||||||
registry.gitlab.com/albertito/chasquid:master
|
registry.gitlab.com/albertito/chasquid:main
|
||||||
Email (full user@domain format): pepe@example.com
|
Email (full user@domain format): pepe@example.com
|
||||||
Password:
|
Password:
|
||||||
pepe@example.com added to /data/dovecot/users
|
pepe@example.com added to /data/dovecot/users
|
||||||
@@ -71,7 +71,7 @@ Finally, start the container:
|
|||||||
$ docker run -e AUTO_CERTS=mail.yourdomain.com \
|
$ docker run -e AUTO_CERTS=mail.yourdomain.com \
|
||||||
--mount source=chasquid-data,target=/data \
|
--mount source=chasquid-data,target=/data \
|
||||||
--network host \
|
--network host \
|
||||||
registry.gitlab.com/albertito/chasquid:master
|
registry.gitlab.com/albertito/chasquid:main
|
||||||
```
|
```
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user