Skip to content

Commit 34883fb

Browse files
committed
updated the README information
1 parent 14d6a11 commit 34883fb

File tree

9 files changed

+25
-95
lines changed

9 files changed

+25
-95
lines changed

Diff for: CONTRIBUTING.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ That will also contain all the generated files with the generated variables, but
4646

4747
* `./scripts/discard-dev-files.sh`:
4848

49-
After using `./scripts/dev-fsfp-back.sh`, there will be a bunch of generated files with the variables for the generated project that you don't want to commit, like `README.md` and `.gitlab-ci.yml`.
49+
After using `./scripts/dev-fsfp-back.sh`, there will be a bunch of generated files with the variables for the generated project that you don't want to commit, like `README.md` and `.actions.yml`.
5050

5151
To discard all those changes at once, run `discard-dev-files.sh` from the root of the project, e.g.:
5252

Diff for: docs/development-guide.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -68,8 +68,8 @@ The input variables, with their default values (some auto generated) are:
6868
- `traefik_public_constraint_tag`: The tag that should be used by stack services that should communicate with the public.
6969
- `flower_auth`: Basic HTTP authentication for flower, in the form`user:password`. By default: "`admin:changethis`".
7070
- `sentry_dsn`: Key URL (DSN) of Sentry, for live error reporting. You can use the open source version or a free account. E.g.: `https://1234abcd:[email protected]/30`.
71-
- `docker_image_prefix`: Prefix to use for Docker image names. If you are using GitLab Docker registry it would be based on your code repository. E.g.: `git.example.com/development-team/my-awesome-project/`.
72-
- `docker_image_backend`: Docker image name for the backend. By default, it will be based on your Docker image prefix, e.g.: `git.example.com/development-team/my-awesome-project/backend`. And depending on your environment, a different tag will be appended ( `prod`, `stag`, `branch` ). So, the final image names used will be like: `git.example.com/development-team/my-awesome-project/backend:prod`.
71+
- `docker_image_prefix`: Prefix to use for Docker image names. If you are using A non-DockerHub registry it would be based on your code repository. E.g.: `quay.io/development-team/my-awesome-project/`.
72+
- `docker_image_backend`: Docker image name for the backend. By default, it will be based on your Docker image prefix, e.g.: `quay.io/development-team/my-awesome-project/backend`. And depending on your environment, a different tag will be appended ( `prod`, `stag`, `branch` ). So, the final image names used will be like: `quay.io/development-team/my-awesome-project/backend:prod`.
7373
- `docker_image_celeryworker`: Docker image for the celery worker. By default, based on your Docker image prefix.
7474
- `docker_image_frontend`: Docker image for the frontend. By default, based on your Docker image prefix.
7575

Diff for: docs/getting-started.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ This FastAPI, React, MongoDB repo will generate a complete web application stack
3939
- **Flower** for Celery jobs monitoring.
4040
- Load balancing between frontend and backend with **Traefik**, so you can have both under the same domain, separated by path, but served by different containers.
4141
- Traefik integration, including Let's Encrypt **HTTPS** certificates automatic generation.
42-
- GitLab **CI** (continuous integration), including frontend and backend testing.
42+
- **Github Actions** (continuous integration), including backend testing.
4343

4444

4545

Diff for: scripts/dev-fsfp-back.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -19,4 +19,4 @@ rm -rf ./full-stack-fastapi-mongodb/\{\{cookiecutter.project_slug\}\}/*
1919

2020
rsync -a --exclude=node_modules ./dev-fsfp/* ./full-stack-fastapi-mongodb/\{\{cookiecutter.project_slug\}\}/
2121

22-
rsync -a ./dev-fsfp/{.env,.gitignore,.gitlab-ci.yml} ./full-stack-fastapi-mongodb/\{\{cookiecutter.project_slug\}\}/
22+
rsync -a ./dev-fsfp/{.env,.gitignore,.github/workflows/actions.yml} ./full-stack-fastapi-mongodb/\{\{cookiecutter.project_slug\}\}/

Diff for: scripts/discard-dev-files.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ rm -rf \{\{cookiecutter.project_slug\}\}/backend/app/poetry.lock
77
rm -rf \{\{cookiecutter.project_slug\}\}/frontend/node_modules
88
rm -rf \{\{cookiecutter.project_slug\}\}/frontend/.nuxt
99
git checkout \{\{cookiecutter.project_slug\}\}/README.md
10-
git checkout \{\{cookiecutter.project_slug\}\}/.gitlab-ci.yml
10+
git checkout \{\{cookiecutter.project_slug\}\}/.github/workflows/actions.yml
1111
git checkout \{\{cookiecutter.project_slug\}\}/cookiecutter-config-file.yml
1212
git checkout \{\{cookiecutter.project_slug\}\}/.env
1313
git checkout \{\{cookiecutter.project_slug\}\}/frontend/.env

Diff for: {{cookiecutter.project_slug}}/.gitlab-ci.yml

-74
This file was deleted.

Diff for: {{cookiecutter.project_slug}}/README.md

+8-6
Original file line numberDiff line numberDiff line change
@@ -134,7 +134,7 @@ The file `./scripts/test.sh` has the commands to generate a testing `docker-stac
134134

135135
The tests run with Pytest, modify and add tests to `./backend/app/app/tests/`.
136136

137-
If you use GitLab CI the tests will run automatically.
137+
If you use Github Actions the tests will run automatically.
138138

139139
#### Local tests
140140

@@ -387,7 +387,7 @@ Done, you have a frontend-less (api-only) app. 🔥 🚀
387387
If you want, you can also remove the `FRONTEND` environment variables from:
388388

389389
* `.env`
390-
* `.gitlab-ci.yml`
390+
* `.github/workflows/actions.yml`
391391
* `./scripts/*.sh`
392392

393393
But it would be only to clean them up, leaving them won't really have any effect either way.
@@ -622,16 +622,18 @@ docker stack deploy -c docker-stack.yml --with-registry-auth "${STACK_NAME?Varia
622622

623623
### Continuous Integration / Continuous Delivery
624624

625-
If you use GitLab CI, the included `.gitlab-ci.yml` can automatically deploy it. You may need to update it according to your GitLab configurations.
625+
In order to run properly in Github, you need to provide a `secrets.DOCKERHUB_USERNAME` and `secrets.DOCKERHUB_PASSWORD` in your Github repository secrets. Read more [here](https://docs.github.com/en/actions/security-guides/using-secrets-in-github-actions) on how that is done.
626626

627-
If you use any other CI / CD provider, you can base your deployment from that `.gitlab-ci.yml` file, as all the actual script steps are performed in `bash` scripts that you can easily re-use.
627+
If you use Github Actions, the included `actions.yml` can automatically deploy it. You may need to update it according to your Github configurations. Please check the `actions.yml` file for details on deployment steps
628628

629-
GitLab CI is configured assuming 2 environments following GitLab flow:
629+
If you use any other CI / CD provider, you can base your deployment from that `actions.yml` file, as all the actual script steps are performed in `bash` scripts that you can easily re-use.
630+
631+
Github Actions is configured assuming 2 environments following Github flow:
630632

631633
* `prod` (production) from the `production` branch.
632634
* `stag` (staging) from the `master` branch.
633635

634-
If you need to add more environments, for example, you could imagine using a client-approved `preprod` branch, you can just copy the configurations in `.gitlab-ci.yml` for `stag` and rename the corresponding variables. The Docker Compose file and environment variables are configured to support as many environments as you need, so that you only need to modify `.gitlab-ci.yml` (or whichever CI system configuration you are using).
636+
If you need to add more environments, for example, you could imagine using a client-approved `preprod` branch, you can just copy the configurations in `actions.yml` for `stag` and rename the corresponding variables. The Docker Compose file and environment variables are configured to support as many environments as you need, so that you only need to modify `actions.yml` (or whichever CI system configuration you are using).
635637

636638
## Docker Compose files and env vars
637639

Diff for: {{cookiecutter.project_slug}}/backend/app/README.md

+8-6
Original file line numberDiff line numberDiff line change
@@ -143,7 +143,7 @@ The file `./scripts/test.sh` has the commands to generate a testing `docker-stac
143143

144144
The tests run with Pytest, modify and add tests to `./backend/app/app/tests/`.
145145

146-
If you use GitLab CI the tests will run automatically.
146+
If you use Github Actions the tests will run automatically.
147147

148148
#### Local tests
149149

@@ -396,7 +396,7 @@ Done, you have a frontend-less (api-only) app. 🔥 🚀
396396
If you want, you can also remove the `FRONTEND` environment variables from:
397397

398398
* `.env`
399-
* `.gitlab-ci.yml`
399+
* `.github/workflows/actions.yml`
400400
* `./scripts/*.sh`
401401

402402
But it would be only to clean them up, leaving them won't really have any effect either way.
@@ -631,16 +631,18 @@ docker stack deploy -c docker-stack.yml --with-registry-auth "${STACK_NAME?Varia
631631

632632
### Continuous Integration / Continuous Delivery
633633

634-
If you use GitLab CI, the included `.gitlab-ci.yml` can automatically deploy it. You may need to update it according to your GitLab configurations.
634+
In order to run properly in Github, you need to provide a `secrets.DOCKERHUB_USERNAME` and `secrets.DOCKERHUB_PASSWORD` in your Github repository secrets. Read more [here](https://docs.github.com/en/actions/security-guides/using-secrets-in-github-actions) on how that is done.
635635

636-
If you use any other CI / CD provider, you can base your deployment from that `.gitlab-ci.yml` file, as all the actual script steps are performed in `bash` scripts that you can easily re-use.
636+
If you use Github Actions, the included `actions.yml` can automatically deploy it. You may need to update it according to your Github configurations. Please check the `actions.yml` file for details on deployment steps
637637

638-
GitLab CI is configured assuming 2 environments following GitLab flow:
638+
If you use any other CI / CD provider, you can base your deployment from that `actions.yml` file, as all the actual script steps are performed in `bash` scripts that you can easily re-use.
639+
640+
Github Actions is configured assuming 2 environments following Github flow:
639641

640642
* `prod` (production) from the `production` branch.
641643
* `stag` (staging) from the `master` branch.
642644

643-
If you need to add more environments, for example, you could imagine using a client-approved `preprod` branch, you can just copy the configurations in `.gitlab-ci.yml` for `stag` and rename the corresponding variables. The Docker Compose file and environment variables are configured to support as many environments as you need, so that you only need to modify `.gitlab-ci.yml` (or whichever CI system configuration you are using).
645+
If you need to add more environments, for example, you could imagine using a client-approved `preprod` branch, you can just copy the configurations in `actions.yml` for `stag` and rename the corresponding variables. The Docker Compose file and environment variables are configured to support as many environments as you need, so that you only need to modify `actions.yml` (or whichever CI system configuration you are using).
644646

645647
## Docker Compose files and env vars
646648

Diff for: {{cookiecutter.project_slug}}/frontend/app/content/about.md

+3-3
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ This project is a comprehensively updated React + MongoDB version of [Sebastián
4444
- **Flower** for Celery jobs monitoring.
4545
- Load balancing between frontend and backend with **Traefik**, so you can have both under the same domain, separated by path, but served by different containers.
4646
- Traefik integration, including Let's Encrypt **HTTPS** certificates automatic generation.
47-
- GitLab **CI** (continuous integration), including frontend and backend testing.
47+
- **Github Actions** (continuous integration), including backend testing.
4848

4949
## How to use it
5050

@@ -103,8 +103,8 @@ The input variables, with their default values (some auto generated) are:
103103

104104
- `sentry_dsn`: Key URL (DSN) of Sentry, for live error reporting. You can use the open source version or a free account. E.g.: `https://1234abcd:[email protected]/30`.
105105

106-
- `docker_image_prefix`: Prefix to use for Docker image names. If you are using GitLab Docker registry it would be based on your code repository. E.g.: `git.example.com/development-team/my-awesome-project/`.
107-
- `docker_image_backend`: Docker image name for the backend. By default, it will be based on your Docker image prefix, e.g.: `git.example.com/development-team/my-awesome-project/backend`. And depending on your environment, a different tag will be appended ( `prod`, `stag`, `branch` ). So, the final image names used will be like: `git.example.com/development-team/my-awesome-project/backend:prod`.
106+
- `docker_image_prefix`: Prefix to use for Docker image names. If you are using non-native Docker registry it would be based on your code repository. E.g.: `quay.io/development-team/my-awesome-project/`.
107+
- `docker_image_backend`: Docker image name for the backend. By default, it will be based on your Docker image prefix, e.g.: `quay.io/development-team/my-awesome-project/backend`. And depending on your environment, a different tag will be appended ( `prod`, `stag`, `branch` ). So, the final image names used will be like: `git.example.com/development-team/my-awesome-project/backend:prod`.
108108
- `docker_image_celeryworker`: Docker image for the celery worker. By default, based on your Docker image prefix.
109109
- `docker_image_frontend`: Docker image for the frontend. By default, based on your Docker image prefix.
110110

0 commit comments

Comments
 (0)