Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Despliegue #233

Merged
merged 43 commits into from
May 3, 2022
Merged
Changes from 1 commit
Commits
Show all changes
43 commits
Select commit Hold shift + click to select a range
844994d
Arreglo cors y variables de entorno
UO271728 May 2, 2022
b7b91e3
Delete .env
UO271728 May 2, 2022
b08510a
Arreglo workflow
UO271728 May 2, 2022
855cd10
Seguir arreglando el workflow
UO271728 May 2, 2022
9f2a10b
Arreglo minimo test y cambio en workflow
UO271728 May 2, 2022
da13bbb
Commit de un guion
UO271728 May 2, 2022
d65febb
Mas correcciones
UO271728 May 2, 2022
9c2dc35
Prueba
UO271728 May 2, 2022
beb257a
Error tonto
UO271728 May 2, 2022
42f5964
Error tonto 2
UO271728 May 2, 2022
ab3924e
Cambios por probar
UO271728 May 2, 2022
6e10cb3
Creación de variables en string
UO271728 May 2, 2022
b30c815
Añadir principio mongo a la url
UO271728 May 2, 2022
1b2a06e
Cambiando la uri de otra opcion
UO271728 May 2, 2022
ccf567f
Ultimo intento
UO271728 May 2, 2022
76f4350
Cambio en el workflow
UO271728 May 2, 2022
2b438a1
No se me ocurre mas
UO271728 May 2, 2022
b0a5205
Cambio de uri
UO271728 May 2, 2022
434ef62
Prueba completa
UO271728 May 2, 2022
876fdd5
Error tonto 3
UO271728 May 2, 2022
05fe8b1
Vuelta al antiguo workflow
UO271728 May 2, 2022
f5df068
Antiguo
UO271728 May 2, 2022
144f39f
Otro intento
UO271728 May 2, 2022
8ec5a33
Cambiando url
UO271728 May 2, 2022
77e76a7
Merge branch 'develop' into Despliegue
UO271728 May 3, 2022
aca6053
Probar varaible entorno
UO271728 May 3, 2022
6d306dc
Probar API_URL
UO271728 May 3, 2022
48d74da
Probar a sacar las llamadas a la api a api.ts
UO271728 May 3, 2022
f4d538d
Console
UO271728 May 3, 2022
21094a7
Cambiando a API_URI
UO271728 May 3, 2022
7dcc40c
Cambiando el dockerfile
UO271728 May 3, 2022
a553f60
Añadiendo ARG en dockerfile
UO271728 May 3, 2022
59b2758
Intentando entender
UO271728 May 3, 2022
f0a91f5
Otro mas
UO271728 May 3, 2022
e4e8f1f
Cambiando a un .env
UO271728 May 3, 2022
bbd924f
Cambio completo
UO271728 May 3, 2022
4078c06
Error tonto
UO271728 May 3, 2022
8be12a8
Update pruebaSinDocker.yml
UO271728 May 3, 2022
59b8507
Moviendo las peticiones
UO271728 May 3, 2022
9734516
Quitar la barra
UO271728 May 3, 2022
dbfae67
Merge remote-tracking branch 'origin/Despliegue' into Despliegue
UO271728 May 3, 2022
4c46993
Adaptar direcciones
UO271728 May 3, 2022
89424bb
Merge branch 'develop' into Despliegue
UO271728 May 3, 2022
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Antiguo
  • Loading branch information
UO271728 committed May 2, 2022
commit f5df0688c21dadfb247ceca2809305ee80633381
10 changes: 5 additions & 5 deletions .github/workflows/pruebaDeploy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ jobs:
name: Push webapp Docker Image to GitHub Packages
runs-on: ubuntu-latest
steps:
- user: actions/checkoout@v2
- uses: actions/checkout@v2
- name: Publish to Registry
uses: elgohr/Publish-Docker-Github-Action@3.04
with:
Expand All @@ -30,23 +30,23 @@ jobs:
password: ${{ secrets.DOCKER_PUSH_TOKEN }}
registry: ghcr.io
workdir: restapi
deploy-restapi:
deploy-webapp:
needs: [docker-push-restapi,docker-push-webapp]
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- name: Deploy restapi
- name: Deploy webapp
uses: akhileshns/heroku-deploy@v3.12.12
with:
heroku_api_key: ${{ secrets.DEPLOY_KEY }}
heroku_app_name: "dede-es2a-webapp"
heroku_email: ${{ secrets.EMAIL }}
usedocker: true
appdir: "webapp"
appdir: "webapp"
docker_build_args: |
API_URI
env:
API_URI: "https://dede-es2a-restapi.herokuapp.com/"
API_URI: "https://dede-es2a-restapi.herokuapp.com/"
deploy-restapi:
needs: [docker-push-restapi,docker-push-webapp]
runs-on: ubuntu-latest
Expand Down