forked from toolshed/abra
		
	Move apps.json generation stuff out of abra
See https://git.autonomic.zone/coop-cloud/abra/issues/125.
This commit is contained in:
		@ -13,6 +13,7 @@
 | 
			
		||||
- Support unattended mode for recipe releasing ([3759bcd641](https://git.autonomic.zone/coop-cloud/abra/commit/3759bcd641cf60611c13927e83425e773d2bb629))
 | 
			
		||||
- Add Renovate bot configuraiton script ([9fadc430a7](https://git.autonomic.zone/coop-cloud/abra/commit/9fadc430a7bb2d554c0ee26c0f9b6c51dc5b0475))
 | 
			
		||||
- Add release automation via [drone-abra](https://git.autonomic.zone/coop-cloud/drone-abra) ([#56](https://git.autonomic.zone/coop-cloud/organising/issues/56))
 | 
			
		||||
- Move `apps.json` generation to [auto-apps-json](https://git.autonomic.zone/coop-cloud/auto-apps-json) ([#125](https://git.autonomic.zone/coop-cloud/abra/issues/125))
 | 
			
		||||
 | 
			
		||||
# abra 8.0.1 (2021-05-31)
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
							
								
								
									
										19
									
								
								README.md
									
									
									
									
									
								
							
							
						
						
									
										19
									
								
								README.md
									
									
									
									
									
								
							@ -74,17 +74,6 @@ The command-line interface is generated via [docopt](http://docopt.org/). If you
 | 
			
		||||
 | 
			
		||||
Please remember to update the [CHANGELOG](./CHANGELOG.md) when you make a change.
 | 
			
		||||
 | 
			
		||||
## Generating a new apps.json
 | 
			
		||||
 | 
			
		||||
You'll need to install the following requirements:
 | 
			
		||||
 | 
			
		||||
- [requests](https://docs.python-requests.org/en/master/) (`apt install python3-requests` / `pip install requests`)
 | 
			
		||||
- [skopeo](https://github.com/containers/skopeo) (check [the install docs](https://github.com/containers/skopeo/blob/master/install.md))
 | 
			
		||||
- [jq](https://stedolan.github.io/jq/tutorial/) (`sudo apt-get install jq` or see [the install docs](https://stedolan.github.io/jq/download/))
 | 
			
		||||
- [yq](https://mikefarah.gitbook.io/yq/) (see [the install docs](https://mikefarah.gitbook.io/yq/#install))
 | 
			
		||||
 | 
			
		||||
Then run `./bin/app-json.py` ([source](./bin/app-json.py)) and it will spit out the JSON file into [deploy/apps.coopcloud.tech/apps.json](./deploy/apps.coopcloud.tech/apps.json).
 | 
			
		||||
 | 
			
		||||
## Releasing
 | 
			
		||||
 | 
			
		||||
### `abra`
 | 
			
		||||
@ -98,11 +87,3 @@ Then run `./bin/app-json.py` ([source](./bin/app-json.py)) and it will spit out
 | 
			
		||||
- `git push` and `git push --tags`
 | 
			
		||||
- Deploy a new installer script `make release-installer`
 | 
			
		||||
- Tell the world (CoTech forum, Matrix public channel, Autonomic mastodon, etc.)
 | 
			
		||||
 | 
			
		||||
### apps.coopcloud.tech
 | 
			
		||||
 | 
			
		||||
> [apps.coopcloud.tech](https://apps.coopcloud.tech)
 | 
			
		||||
 | 
			
		||||
```bash
 | 
			
		||||
$ make release-apps
 | 
			
		||||
```
 | 
			
		||||
 | 
			
		||||
										
											
												File diff suppressed because it is too large
												Load Diff
											
										
									
								
							@ -1,41 +0,0 @@
 | 
			
		||||
---
 | 
			
		||||
version: "3.8"
 | 
			
		||||
 | 
			
		||||
services:
 | 
			
		||||
  app:
 | 
			
		||||
    image: "nginx:stable"
 | 
			
		||||
    configs:
 | 
			
		||||
      - source: abra_conf
 | 
			
		||||
        target: /etc/nginx/conf.d/abra.conf
 | 
			
		||||
      - source: abra_apps_json
 | 
			
		||||
        target: /var/www/abra-apps/apps.json
 | 
			
		||||
    volumes:
 | 
			
		||||
      - "public:/var/www/abra-apps"
 | 
			
		||||
    networks:
 | 
			
		||||
      - proxy
 | 
			
		||||
    deploy:
 | 
			
		||||
      update_config:
 | 
			
		||||
        failure_action: rollback
 | 
			
		||||
        order: start-first
 | 
			
		||||
      labels:
 | 
			
		||||
        - "traefik.enable=true"
 | 
			
		||||
        - "traefik.http.services.abra-apps.loadbalancer.server.port=80"
 | 
			
		||||
        - "traefik.http.routers.abra-apps.rule=Host(`apps.coopcloud.tech`, `abra-apps.cloud.autonomic.zone`)"
 | 
			
		||||
        - "traefik.http.routers.abra-apps.entrypoints=web-secure"
 | 
			
		||||
        - "traefik.http.routers.abra-apps.tls.certresolver=production"
 | 
			
		||||
        - "traefik.http.routers.abra-apps.middlewares=abra-apps-redirect"
 | 
			
		||||
        - "traefik.http.middlewares.abra-apps-redirect.headers.SSLForceHost=true"
 | 
			
		||||
        - "traefik.http.middlewares.abra-apps-redirect.headers.SSLHost=apps.coopcloud.tech"
 | 
			
		||||
 | 
			
		||||
configs:
 | 
			
		||||
  abra_apps_json:
 | 
			
		||||
    file: apps.json
 | 
			
		||||
  abra_conf:
 | 
			
		||||
    file: nginx.conf
 | 
			
		||||
 | 
			
		||||
networks:
 | 
			
		||||
  proxy:
 | 
			
		||||
    external: true
 | 
			
		||||
 | 
			
		||||
volumes:
 | 
			
		||||
  public:
 | 
			
		||||
@ -1,10 +0,0 @@
 | 
			
		||||
server {
 | 
			
		||||
  listen         80 default_server;
 | 
			
		||||
  server_name    apps.coopcloud.tech;
 | 
			
		||||
 | 
			
		||||
  location / {
 | 
			
		||||
    root /var/www/abra-apps;
 | 
			
		||||
    add_header Content-Type application/json;
 | 
			
		||||
    index apps.json;
 | 
			
		||||
  }
 | 
			
		||||
}
 | 
			
		||||
							
								
								
									
										6
									
								
								makefile
									
									
									
									
									
								
							
							
						
						
									
										6
									
								
								makefile
									
									
									
									
									
								
							@ -38,12 +38,6 @@ release-installer:
 | 
			
		||||
		cd deploy/install.abra.coopcloud.tech && \
 | 
			
		||||
		DOCKER_CONTEXT=swarm.autonomic.zone docker stack deploy -c compose.yml abra-installer-script
 | 
			
		||||
 | 
			
		||||
release-apps:
 | 
			
		||||
	@DOCKER_CONTEXT=swarm.autonomic.zone \
 | 
			
		||||
		docker stack rm abra-apps-json && \
 | 
			
		||||
		cd deploy/apps.coopcloud.tech && \
 | 
			
		||||
		DOCKER_CONTEXT=swarm.autonomic.zone docker stack deploy -c compose.yml abra-apps-json
 | 
			
		||||
 | 
			
		||||
build:
 | 
			
		||||
	@docker build -t decentral1se/abra .
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
		Reference in New Issue
	
	Block a user