Skip to content

Commit 19d7a74

Browse files
EPajaresEPajares
authored
Merge pull request #1320 from goat-community/dev
Changes for v1.1
2 parents 0770b41 + c0ef382 commit 19d7a74

File tree

973 files changed

+59454
-45160
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

973 files changed

+59454
-45160
lines changed

‎.env_template‎

Lines changed: 61 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,61 @@
1+
##############################################################
2+
# #
3+
# GOAT Settings #
4+
# #
5+
# The settings are suited for development purpose. #
6+
# If you're deploying GOAT for production, you need to #
7+
# consider using k8s config files #
8+
# # #
9+
# #
10+
##############################################################
11+
12+
# GLOBAL SETTINGS
13+
COMPOSE_PROJECT_NAME=goat
14+
PROJECT_VERSION=1.2
15+
DOCKER_ID=goatcommunity
16+
DOMAIN_NAME=localhost
17+
18+
# DATABASE ENV
19+
POSTGRES_SERVER=goat_db
20+
POSTGRES_USER=postgres
21+
POSTGRES_PASSWORD=12345678
22+
POSTGRES_OUTER_PORT=55432
23+
PGADMIN_LISTEN_PORT=5050
24+
PGADMIN_DEFAULT_EMAIL=pgadmin@plan4better.de
25+
PGADMIN_DEFAULT_PASSWORD=Tirana_123
26+
27+
# DATABASE STAGING ENV
28+
POSTGRES_DB_STAGING=goat_update
29+
POSTGRES_SERVER_STAGING=db
30+
POSTGRES_USER_STAGING=postgres
31+
POSTGRES_PASSWORD_STAGING=12345678
32+
POSTGRES_OUTER_PORT_STAGING=5432
33+
34+
# API ENV
35+
BACKEND_CORS_ORIGINS=["http://localhost"]
36+
API_SECRET_KEY=12345678
37+
FIRST_ORGANIZATION=Plan4Better
38+
FIRST_SUPERUSER_NAME=FirstUserName
39+
FIRST_SUPERUSER_SURNAME=FirstUserSurname
40+
FIRST_SUPERUSER_PASSWORD=12345678
41+
FIRST_SUPERUSER_EMAIL=firstuser@plan4better.de
42+
FIRST_SUPERUSER_STORAGE=500000 #In kilobytes
43+
FIRST_SUPERUSER_ACTIVE_STUDY_AREA_ID=91620000
44+
SMTP_TLS=True
45+
SMTP_PORT=587
46+
SMTP_HOST=
47+
SMTP_USER=
48+
SMTP_PASSWORD=
49+
EMAILS_FROM_EMAIL=test-reply@plan4better.de
50+
USERS_OPEN_REGISTRATION=False
51+
SENTRY_DSN=
52+
INSTALL_DEV=True
53+
INSTALL_JUPYTER=True
54+
55+
# FRONTENDENV
56+
VUE_APP_I18N_LOCALE=en
57+
VUE_APP_I18N_FALLBACK_LOCALE=en
58+
VUE_APP_SEARCH_KEY=ca068d7840bca4
59+
VUE_APP_SEARCH_URL=https://api.locationiq.com/v1
60+
API_BASEURL=http://goat_api:5000/
61+
FONTAWESOME_NPM_AUTH_TOKEN=

‎.github/workflows/PR.yaml‎

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
1+
name: PR
2+
3+
on:
4+
pull_request:
5+
branches: [ prod, dev, staging ]
6+
7+
jobs:
8+
build:
9+
runs-on: ubuntu-latest
10+
env:
11+
DOCKER_USERNAME: ${{ secrets.DOCKER_USERNAME }}
12+
DOCKER_PASSWORD: ${{ secrets.DOCKER_PASSWORD }}
13+
FONTAWESOME_NPM_AUTH_TOKEN: ${{ secrets.FONTAWESOME_NPM_AUTH_TOKEN }}
14+
steps:
15+
- uses: actions/checkout@v2
16+
- name: Get changed files
17+
id: get_file_changes
18+
uses: trilom/file-changes-action@v1.2.4
19+
with:
20+
output: ' '
21+
- name: Show changed files
22+
run: echo ${{steps.get_file_changes.outputs.files}}
23+
- name: Build changed client
24+
if: contains(steps.get_file_changes.outputs.files, 'app/client')
25+
run: make build-client-docker-image -e COMPONENT=client
26+
- name: Build changed api
27+
if: contains(steps.get_file_changes.outputs.files, 'app/api')
28+
run: make build-docker-image -e COMPONENT=api

‎.github/workflows/Push.yaml‎

Lines changed: 88 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,88 @@
1+
name: Push
2+
3+
on:
4+
push:
5+
branches: [ prod, dev, staging ]
6+
7+
jobs:
8+
release:
9+
runs-on: ubuntu-latest
10+
env:
11+
DOCKER_USERNAME: ${{ secrets.DOCKER_USERNAME }}
12+
DOCKER_PASSWORD: ${{ secrets.DOCKER_PASSWORD }}
13+
FONTAWESOME_NPM_AUTH_TOKEN: ${{ secrets.FONTAWESOME_NPM_AUTH_TOKEN }}
14+
steps:
15+
- uses: actions/checkout@v2
16+
- name: Get changed files
17+
id: get_file_changes
18+
uses: trilom/file-changes-action@v1.2.4
19+
with:
20+
output: ' '
21+
- name: Release changed client
22+
if: contains(steps.get_file_changes.outputs.files, 'app/client') || contains(github.event.head_commit.message, 'trigger build')
23+
run: make release-client-docker-image -e COMPONENT=client
24+
- name: Release changed api
25+
if: contains(steps.get_file_changes.outputs.files, 'app/api') || contains(github.event.head_commit.message, 'trigger build')
26+
run: make release-docker-image -e COMPONENT=api
27+
- name: Some check on branch
28+
id: branch_check
29+
run: |
30+
echo "Running on branch ${{ github.ref }}"
31+
if [ "${{ github.ref }}" = "refs/heads/prod" ]; then
32+
echo "::set-output name=env_name::main"
33+
elif [ "${{ github.ref }}" = "refs/heads/staging" ]; then
34+
echo "::set-output name=env_name::staging"
35+
else
36+
echo "::set-output name=env_name::dev"
37+
fi
38+
39+
- name: Use variable setup in previous step
40+
run: echo "I'm using variable ${{ steps.branch_check.outputs.env_name }}"
41+
42+
outputs:
43+
env_name: ${{ steps.branch_check.outputs.env_name }}
44+
45+
46+
deploy:
47+
runs-on: ubuntu-latest
48+
environment:
49+
name: ${{ needs.release.outputs.env_name }}
50+
needs: [release]
51+
env:
52+
53+
54+
AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
55+
AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
56+
KUBE_CONFIG: ${{ secrets.KUBE_CONFIG }}
57+
POSTGRES_DB: ${{ secrets.POSTGRES_DB }}
58+
POSTGRES_USER: ${{ secrets.POSTGRES_USER }}
59+
POSTGRES_PASSWORD: ${{ secrets.POSTGRES_PASSWORD }}
60+
POSTGRES_HOST: ${{ secrets.POSTGRES_HOST }}
61+
API_SECRET_KEY: ${{ secrets.API_SECRET_KEY }}
62+
SENTRY_DSN: ${{ secrets.SENTRY_DSN }}
63+
EMAILS_FROM_EMAIL: ${{ secrets.EMAILS_FROM_EMAIL }}
64+
FIRST_ORGANIZATION: ${{ secrets.FIRST_ORGANIZATION }}
65+
FIRST_SUPERUSER_EMAIL: ${{ secrets.FIRST_SUPERUSER_EMAIL }}
66+
FIRST_SUPERUSER_PASSWORD: ${{ secrets.FIRST_SUPERUSER_PASSWORD }}
67+
FIRST_SUPERUSER_NAME: ${{ secrets.FIRST_SUPERUSER_NAME }}
68+
FIRST_SUPERUSER_SURNAME: ${{ secrets.FIRST_SUPERUSER_SURNAME }}
69+
SMTP_PASSWORD: ${{ secrets.SMTP_PASSWORD }}
70+
steps:
71+
- uses: actions/checkout@v2
72+
- uses: azure/setup-kubectl@v2.0
73+
with:
74+
version: 'v1.23.6' # default is latest stable
75+
id: install
76+
- name: Get changed files
77+
id: get_file_changes
78+
uses: trilom/file-changes-action@v1.2.4
79+
with:
80+
output: ' '
81+
- name: Deploy postgres-service
82+
run: make deploy -e COMPONENT=postgres
83+
- name: Deploy changed client
84+
if: contains(steps.get_file_changes.outputs.files, 'app/client') || contains(github.event.head_commit.message, 'trigger build')
85+
run: make deploy -e COMPONENT=client
86+
- name: Deploy changed api
87+
if: contains(steps.get_file_changes.outputs.files, 'app/api') || contains(github.event.head_commit.message, 'trigger build')
88+
run: make deploy -e COMPONENT=api

‎.gitignore‎

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -12,10 +12,8 @@ ubuntu-bionic-18.04-cloudimg-console.log
1212
node_modules
1313
.env
1414
/.vscode
15-
/app/api/__pycache__
16-
/app/api/functions/__pycache__
17-
/app/api/venv
18-
/app/api/flask/bin
19-
/app/api/flask/lib
20-
/app/api/flask/lib64
21-
__pycache__
15+
16+
/app/api/app/app/exts/cpp/build
17+
__pycache__
18+
/app/api/src/data/*
19+
!/app/api/src/data/.gitkeep

‎.travis.yml‎

Lines changed: 0 additions & 83 deletions
This file was deleted.

0 commit comments

Comments
 (0)