Skip to content

Commit

Permalink
Replaced names from original repo (pzlez) to arquisoft
Browse files Browse the repository at this point in the history
  • Loading branch information
labra committed Jan 21, 2024
1 parent 2b13d4e commit 4e46a61
Show file tree
Hide file tree
Showing 6 changed files with 19 additions and 23 deletions.
12 changes: 6 additions & 6 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ jobs:
env:
API_URI: http://${{ secrets.DEPLOY_HOST }}:8000
with:
name: pglez82/asw2324_0/webapp
name: arquisoft/wiq_0/webapp
username: ${{ github.actor }}
password: ${{ secrets.GITHUB_TOKEN }}
registry: ghcr.io
Expand All @@ -71,7 +71,7 @@ jobs:
- name: Publish to Registry
uses: elgohr/Publish-Docker-Github-Action@v5
with:
name: pglez82/asw2324_0/authservice
name: arquisoft/wiq_0/authservice
username: ${{ github.actor }}
password: ${{ secrets.GITHUB_TOKEN }}
registry: ghcr.io
Expand All @@ -88,7 +88,7 @@ jobs:
- name: Publish to Registry
uses: elgohr/Publish-Docker-Github-Action@v5
with:
name: pglez82/asw2324_0/userservice
name: arquisoft/wiq_0/userservice
username: ${{ github.actor }}
password: ${{ secrets.GITHUB_TOKEN }}
registry: ghcr.io
Expand All @@ -105,7 +105,7 @@ jobs:
- name: Publish to Registry
uses: elgohr/Publish-Docker-Github-Action@v5
with:
name: pglez82/asw2324_0/gatewayservice
name: arquisoft/wiq_0/gatewayservice
username: ${{ github.actor }}
password: ${{ secrets.GITHUB_TOKEN }}
registry: ghcr.io
Expand All @@ -122,7 +122,7 @@ jobs:
user: ${{ secrets.DEPLOY_USER }}
key: ${{ secrets.DEPLOY_KEY }}
command: |
wget https://raw.githubusercontent.com/pglez82/asw2324_0/master/docker-compose.yml
wget https://raw.githubusercontent.com/pglez82/asw2324_0/master/docker-compose-deploy.override.yml
wget https://raw.githubusercontent.com/arquisoft/wiq_0/master/docker-compose.yml
wget https://raw.githubusercontent.com/arquisoft/wiq_0/master/docker-compose-deploy.override.yml
docker compose down
docker compose -f docker-compose.yml -f docker-compose-deploy.override.yml up -d
4 changes: 0 additions & 4 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -83,10 +83,6 @@ Once we have our machine ready, we could deploy by hand the application, taking

In this repository, this process is done automatically using **GitHub Actions**. The idea is to trigger a series of actions when some condition is met in the repository.

The precondition to trigger a deployment is going to be: "create a new release". The actions to execute are the following:

![imagen](https://github.com/pglez82/asw2324_0/assets/10683040/44d0fe21-a93f-4b01-b458-ab7af4267fa3)

As you can see, unitary tests of each module and e2e tests are executed before pushing the docker images and deploying them. Using this approach we avoid deploying versions that do not pass the tests.

The deploy action is the following:
Expand Down
8 changes: 4 additions & 4 deletions docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,21 +8,21 @@ services:

authservice:
container_name: authservice-${teamname:-defaultASW}
image: ghcr.io/pglez82/asw2324_0/authservice:latest
image: ghcr.io/arquisoft/wiq_0/authservice:latest
build: ./users/authservice
depends_on:
- mongodb

userservice:
container_name: userservice-${teamname:-defaultASW}
image: ghcr.io/pglez82/asw2324_0/userservice:latest
image: ghcr.io/arquisoft/wiq_0/userservice:latest
build: ./users/userservice
depends_on:
- mongodb

gatewayservice:
container_name: gatewayservice-${teamname:-defaultASW}
image: ghcr.io/pglez82/asw2324_0/gatewayservice:latest
image: ghcr.io/arquisoft/wiq_0/gatewayservice:latest
build: ./gatewayservice
depends_on:
- mongodb
Expand All @@ -31,7 +31,7 @@ services:

webapp:
container_name: webapp-${teamname:-defaultASW}
image: ghcr.io/pglez82/asw2324_0/webapp:latest
image: ghcr.io/arquisoft/wiq_0/webapp:latest
build: ./webapp
depends_on:
- gatewayservice
Expand Down
6 changes: 3 additions & 3 deletions gatewayservice/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -9,14 +9,14 @@
},
"repository": {
"type": "git",
"url": "git+https://github.com/pglez82/asw2324_0.git"
"url": "git+https://github.com/arquisoft/wiq_0.git"
},
"author": "",
"license": "ISC",
"bugs": {
"url": "https://github.com/pglez82/asw2324_0/issues"
"url": "https://github.com/arquisoft/wiq_0/issues"
},
"homepage": "https://github.com/pglez82/asw2324_0#readme",
"homepage": "https://github.com/arquisoft/wiq_0#readme",
"dependencies": {
"axios": "^1.6.5",
"cors": "^2.8.5",
Expand Down
6 changes: 3 additions & 3 deletions users/authservice/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -9,14 +9,14 @@
},
"repository": {
"type": "git",
"url": "git+https://github.com/pglez82/asw2324_0.git"
"url": "git+https://github.com/arquisoft/wiq_0.git"
},
"author": "",
"license": "ISC",
"bugs": {
"url": "https://github.com/pglez82/asw2324_0/issues"
"url": "https://github.com/arquisoft/wiq_0/issues"
},
"homepage": "https://github.com/pglez82/asw2324_0#readme",
"homepage": "https://github.com/arquisoft/wiq_0#readme",
"dependencies": {
"bcrypt": "^5.1.1",
"body-parser": "^1.20.2",
Expand Down
6 changes: 3 additions & 3 deletions users/userservice/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -9,14 +9,14 @@
},
"repository": {
"type": "git",
"url": "git+https://github.com/pglez82/asw2324_0.git"
"url": "git+https://github.com/arquisoft/wiq_0.git"
},
"author": "",
"license": "ISC",
"bugs": {
"url": "https://github.com/pglez82/asw2324_0/issues"
"url": "https://github.com/arquisoft/wiq_0/issues"
},
"homepage": "https://github.com/pglez82/asw2324_0#readme",
"homepage": "https://github.com/arquisoft/wiq_0#readme",
"dependencies": {
"bcrypt": "^5.1.1",
"body-parser": "^1.20.2",
Expand Down

0 comments on commit 4e46a61

Please sign in to comment.