knoflook/abra
Archived
0
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Migrate abra installer to coopcloud.tech domain

Browse Source 
Closes coop-cloud/abra#150.
This commit is contained in:
decentral1se 2021-05-31 21:10:51 +02:00
parent 0af0ea096f
commit 499cc46583
Signed by untrusted user who does not match committer: decentral1se
GPG Key ID: 92DAD76BD9567B8A
7 changed files with 12 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGELOG.md
View File

@ -10,6 +10,7 @@
# abra x.x.x (UNRELEASED) # abra x.x.x (UNRELEASED)
- Only ouput secrets warnings once ([#143](https://git.autonomic.zone/coop-cloud/abra/issues/143)) - Only ouput secrets warnings once ([#143](https://git.autonomic.zone/coop-cloud/abra/issues/143))
- Migrate `abra` installation script to `coopcloud.tech` domain ([#150](https://git.autonomic.zone/coop-cloud/abra/issues/150))
# abra 8.0.0 (2021-05-30) # abra 8.0.0 (2021-05-30)

12
README.md
View File

@ -39,16 +39,16 @@ Requirements:
Install the latest stable release: Install the latest stable release:
```sh ```sh
curl https://install.abra.autonomic.zone | bash curl https://install.abra.coopcloud.tech | bash
``` ```
or the bleeding-edge development version: or the bleeding-edge development version:
```sh ```sh
curl https://install.abra.autonomic.zone | bash -s -- --dev curl https://install.abra.coopcloud.tech | bash -s -- --dev
``` ```
The source for this script is [here](./deploy/install.abra.autonomic.zone/installer). The source for this script is [here](./deploy/install.abra.coopcloud.tech/installer).
## Update ## Update
@ -61,7 +61,7 @@ To update the development version, run `abra upgrade --dev`.
It's written in Bash version 4 or greater! It's written in Bash version 4 or greater!
Install it via `curl https://install.abra.autonomic.zone | bash -s -- --dev`, then you can hack on the source in `~/.abra/src`. Install it via `curl https://install.abra.coopcloud.tech | bash -s -- --dev`, then you can hack on the source in `~/.abra/src`.
The command-line interface is generated via [docopt](http://docopt.org/). If you add arguments then you need to run `make docopt` ro regenerate the parser. The command-line interface is generated via [docopt](http://docopt.org/). If you add arguments then you need to run `make docopt` ro regenerate the parser.
@ -82,11 +82,11 @@ Then run `./bin/app-json.py` ([source](./bin/app-json.py)) and it will spit out
### `abra` ### `abra`
> [install.abra.autonomic.zone](https://install.abra.autonomic.zone) > [install.abra.coopcloud.tech](https://install.abra.coopcloud.tech)
- Change the `x.x.x` header in [CHANGELOG.md](./CHANGELOG.md) to reflect new version and mark date - Change the `x.x.x` header in [CHANGELOG.md](./CHANGELOG.md) to reflect new version and mark date
- Update the version in [abra](./abra) - Update the version in [abra](./abra)
- Update the version in [deploy/install.abra.autonomic.zone/installer](./deploy/install.abra.autonomic.zone/installer) - Update the version in [deploy/install.abra.coopcloud.tech/installer](./deploy/install.abra.coopcloud.tech/installer)
- `git commit` the above changes and then tag it with `git tag <your-new-version>` - `git commit` the above changes and then tag it with `git tag <your-new-version>`
- `git push` and `git push --tags` - `git push` and `git push --tags`
- Deploy a new installer script `make release-installer` - Deploy a new installer script `make release-installer`

4
abra
View File

@ -2398,9 +2398,9 @@ OPTIONS
sub_upgrade() { sub_upgrade() {
if [[ "$abra___dev" == "true" ]]; then if [[ "$abra___dev" == "true" ]]; then
curl https://install.abra.autonomic.zone | bash -s -- --dev curl https://install.abra.coopcloud.tech | bash -s -- --dev
else else
curl https://install.abra.autonomic.zone | bash curl https://install.abra.coopcloud.tech | bash
fi fi
} }

2
deploy/install.abra.autonomic.zone/compose.yml → deploy/install.abra.coopcloud.tech/compose.yml
View File

@ -20,7 +20,7 @@ services:
labels: labels:
- "traefik.enable=true" - "traefik.enable=true"
- "traefik.http.services.abra-installer.loadbalancer.server.port=80" - "traefik.http.services.abra-installer.loadbalancer.server.port=80"
- "traefik.http.routers.abra-installer.rule=Host(`install.abra.autonomic.zone`)" - "traefik.http.routers.abra-installer.rule=Host(`install.abra.autonomic.zone`,`install.abra.coopcloud.tech`)"
- "traefik.http.routers.abra-installer.entrypoints=web-secure" - "traefik.http.routers.abra-installer.entrypoints=web-secure"
- "traefik.http.routers.abra-installer.tls.certresolver=production" - "traefik.http.routers.abra-installer.tls.certresolver=production"

0
deploy/install.abra.autonomic.zone/installer → deploy/install.abra.coopcloud.tech/installer
View File

2
deploy/install.abra.autonomic.zone/nginx.conf → deploy/install.abra.coopcloud.tech/nginx.conf
View File

@ -1,6 +1,6 @@
server { server {
listen 80 default_server; listen 80 default_server;
server_name install.abra.autonomic.zone; server_name install.abra.autonomic.zone install.abra.coopcloud.tech;
location / { location / {
root /var/www/abra-installer; root /var/www/abra-installer;

2
makefile
View File

@ -48,7 +48,7 @@ codecov:
release-installer: release-installer:
@DOCKER_CONTEXT=swarm.autonomic.zone \ @DOCKER_CONTEXT=swarm.autonomic.zone \
docker stack rm abra-installer-script && \ docker stack rm abra-installer-script && \
cd deploy/install.abra.autonomic.zone && \ cd deploy/install.abra.coopcloud.tech && \
DOCKER_CONTEXT=swarm.autonomic.zone docker stack deploy -c compose.yml abra-installer-script DOCKER_CONTEXT=swarm.autonomic.zone docker stack deploy -c compose.yml abra-installer-script
release-apps: release-apps: