From 4e46a61903cc3b77984f943089368a3b802410a3 Mon Sep 17 00:00:00 2001 From: Jose Emilio Labra Gayo Date: Sun, 21 Jan 2024 12:25:27 +0100 Subject: [PATCH] Replaced names from original repo (pzlez) to arquisoft --- .github/workflows/release.yml | 12 ++++++------ README.md | 4 ---- docker-compose.yml | 8 ++++---- gatewayservice/package.json | 6 +++--- users/authservice/package.json | 6 +++--- users/userservice/package.json | 6 +++--- 6 files changed, 19 insertions(+), 23 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index b861d578..6feea162 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -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 @@ -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 @@ -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 @@ -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 @@ -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 diff --git a/README.md b/README.md index 343c4875..cc5e628d 100644 --- a/README.md +++ b/README.md @@ -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: diff --git a/docker-compose.yml b/docker-compose.yml index eddc7432..be03b81d 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -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 @@ -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 diff --git a/gatewayservice/package.json b/gatewayservice/package.json index d5a3653e..fd16c42c 100644 --- a/gatewayservice/package.json +++ b/gatewayservice/package.json @@ -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", diff --git a/users/authservice/package.json b/users/authservice/package.json index 0e9dea93..6b5b6239 100644 --- a/users/authservice/package.json +++ b/users/authservice/package.json @@ -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", diff --git a/users/userservice/package.json b/users/userservice/package.json index 554a8691..2462c8e0 100644 --- a/users/userservice/package.json +++ b/users/userservice/package.json @@ -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",