verdnatura/salix
verdnatura
/
salix
3
4
Fork 0
Code Issues Pull Requests 57 Releases Wiki Activity

WIP: 5739-dockerRefactor #1822

Draft
alexm wants to merge 67 commits from 5739-dockerRefactor into dev
pull from: 5739-dockerRefactor
merge into: verdnatura:dev
Conversation 0 Commits 67 Files Changed 22 +4083 -680
alexm commented 2023-11-03 13:42:10 +00:00
Member
Copy Link
No description provided.
alexm added 2 commits 2023-11-03 13:42:12 +00:00
gitea/salix/pipeline/head This commit looks good Details
bc4ec73f47 refs #5739 refactor: dockerFile
gitea/salix/pipeline/head This commit looks good Details
13ffa5c3eb refs #5739 refactor: dockerFile
alexm requested review from juan 2023-11-03 13:42:27 +00:00
jsegarra added 1 commit 2023-11-15 12:36:09 +00:00
gitea/salix/pipeline/head This commit looks good Details
0167a55f61 refs #5739 feat: new docker-compose local exec
jsegarra added 1 commit 2023-11-15 12:38:43 +00:00
gitea/salix/pipeline/head This commit looks good Details
cbcab64f8b refs #5739 perf print/package-lock.json
jsegarra added 1 commit 2023-11-16 06:33:29 +00:00
gitea/salix/pipeline/head This commit looks good Details
c5c2252a74 refs #5739 perf: same network
alexm added 5 commits 2023-11-20 08:38:18 +00:00
alexm added 1 commit 2023-11-21 10:52:53 +00:00
alexm added 1 commit 2023-11-24 14:12:29 +00:00
gitea/salix/pipeline/head This commit looks good Details
24f3cb2244 refs #5739 feat: run db, back and front in docker
alexm added 1 commit 2023-11-24 14:12:50 +00:00
jsegarra added 2 commits 2023-11-28 12:06:01 +00:00
juan refused to review 2023-12-11 10:09:11 +00:00
juan changed title from 5739-dockerRefactor to WIP: 5739-dockerRefactor 2023-12-11 10:09:19 +00:00
alexm added 1 commit 2023-12-13 14:32:13 +00:00
alexm added 1 commit 2023-12-19 14:32:26 +00:00
gitea/salix/pipeline/head There was a failure building this commit Details
e4dcdc0a72 refs #5739 feat(docker): run back tests
alexm added 1 commit 2023-12-21 14:29:32 +00:00
gitea/salix/pipeline/head There was a failure building this commit Details
bd062adf2a refs #5739 feat: autoinstall node_modules
alexm added 1 commit 2024-01-04 14:44:56 +00:00
gitea/salix/pipeline/head There was a failure building this commit Details
07af295730 refs #5739 feat: run test back & fix: docker network
alexm added 2 commits 2024-01-08 12:43:02 +00:00
gitea/salix/pipeline/head Something is wrong with the build of this commit Details
06f1781b43 refs #5739 try jenkins
alexm added 1 commit 2024-01-08 13:45:42 +00:00
gitea/salix/pipeline/head There was a failure building this commit Details
593b58134e refs #5739 feat: docker test back
alexm added 1 commit 2024-01-08 14:47:58 +00:00
gitea/salix/pipeline/head There was a failure building this commit Details
61fa3a62db refs #5739 feat: start docker test front and e2e
alexm added 1 commit 2024-01-11 12:33:33 +00:00
gitea/salix/pipeline/head There was a failure building this commit Details
f713ec268f refs #5739 feat: try run test back
alexm added 1 commit 2024-01-12 06:59:25 +00:00
gitea/salix/pipeline/head This commit looks good Details
1319428085 refs #5739 feat: try run test back
alexm added 1 commit 2024-01-12 09:49:10 +00:00
gitea/salix/pipeline/head Something is wrong with the build of this commit Details
d0e64dff2b refs #5739 feat: try run test back and front
alexm added 1 commit 2024-01-12 09:52:07 +00:00
gitea/salix/pipeline/head There was a failure building this commit Details
63fa732ba9 refs #5739 feat: try run test back and front
alexm added 2 commits 2024-01-12 10:41:15 +00:00
gitea/salix/pipeline/head There was a failure building this commit Details
5604423de0 refs #5739 feat: try run test back and front
alexm added 1 commit 2024-01-12 10:54:10 +00:00
gitea/salix/pipeline/head There was a failure building this commit Details
336c678801 refs #5739 feat: try run test back and front
alexm added 1 commit 2024-01-12 12:36:23 +00:00
gitea/salix/pipeline/head There was a failure building this commit Details
31fc3c5b35 refs #5739 feat: try remove duplicate networks
alexm added 1 commit 2024-01-12 12:38:00 +00:00
gitea/salix/pipeline/head There was a failure building this commit Details
56dc5ebb0e refs #5739 feat: try remove duplicate networks
alexm added 1 commit 2024-01-12 12:40:59 +00:00
gitea/salix/pipeline/head There was a failure building this commit Details
0ea9997753 refs #5739 feat: try remove duplicate networks
alexm added 1 commit 2024-01-12 12:49:43 +00:00
gitea/salix/pipeline/head There was a failure building this commit Details
112a5f1f3a refs #5739 feat: try remove duplicate networks
alexm added 1 commit 2024-01-12 12:54:05 +00:00
gitea/salix/pipeline/head There was a failure building this commit Details
ccd80eb6e2 refs #5739 feat: try remove duplicate networks
alexm added 1 commit 2024-01-12 12:55:44 +00:00
gitea/salix/pipeline/head There was a failure building this commit Details
bfce8a57d4 refs #5739 feat: try remove duplicate networks
alexm added 1 commit 2024-01-12 13:05:56 +00:00
gitea/salix/pipeline/head There was a failure building this commit Details
22b0e65e35 refs #5739 feat: try remove duplicate networks
alexm added 1 commit 2024-01-12 13:07:35 +00:00
gitea/salix/pipeline/head There was a failure building this commit Details
2c61f21868 refs #5739 feat: try remove duplicate networks
alexm added 1 commit 2024-01-12 13:09:46 +00:00
gitea/salix/pipeline/head There was a failure building this commit Details
5fa1637d84 refs #5739 feat: try remove duplicate networks
alexm added 1 commit 2024-01-12 13:12:07 +00:00
gitea/salix/pipeline/head There was a failure building this commit Details
ce697f8ba5 refs #5739 feat: try remove duplicate networks
alexm added 1 commit 2024-01-12 13:14:28 +00:00
gitea/salix/pipeline/head There was a failure building this commit Details
6d02a8dc0c refs #5739 feat: try remove duplicate networks
alexm added 1 commit 2024-01-12 13:18:55 +00:00
gitea/salix/pipeline/head There was a failure building this commit Details
6252c698d3 refs #5739 feat: try remove duplicate networks
alexm added 1 commit 2024-01-12 13:20:36 +00:00
gitea/salix/pipeline/head There was a failure building this commit Details
570d6b63b0 refs #5739 feat: try remove duplicate networks
alexm added 1 commit 2024-01-15 08:00:49 +00:00
gitea/salix/pipeline/head There was a failure building this commit Details
574fad7431 refs #5739 feat: try run test back and front
alexm added 2 commits 2024-01-15 11:54:29 +00:00
gitea/salix/pipeline/head There was a failure building this commit Details
417503bd06 refs #5739 feat: try run test back and front
alexm added 1 commit 2024-01-15 12:08:46 +00:00
gitea/salix/pipeline/head There was a failure building this commit Details
f477cdb878 refs #5739 feat: try run test back and front
alexm added 1 commit 2024-01-15 12:10:32 +00:00
gitea/salix/pipeline/head There was a failure building this commit Details
356c12c140 refs #5739 feat: try run test back and front
alexm added 1 commit 2024-01-15 12:16:48 +00:00
gitea/salix/pipeline/head There was a failure building this commit Details
ac696fde40 refs #5739 feat: try run test back and front
alexm added 1 commit 2024-01-15 12:21:21 +00:00
gitea/salix/pipeline/head There was a failure building this commit Details
da4c1812c4 refs #5739 feat: try run test back and front
alexm added 1 commit 2024-01-15 12:23:00 +00:00
gitea/salix/pipeline/head There was a failure building this commit Details
72465b0eac refs #5739 feat: try run test back and front
alexm added 1 commit 2024-01-15 12:35:47 +00:00
gitea/salix/pipeline/head Something is wrong with the build of this commit Details
bd31b9f424 refs #5739 feat: try run test back and front
alexm added 1 commit 2024-01-15 13:54:21 +00:00
gitea/salix/pipeline/head Something is wrong with the build of this commit Details
40afa1083c refs #5739 feat: try run test back and front
alexm added 1 commit 2024-01-15 14:13:42 +00:00
gitea/salix/pipeline/head This commit looks good Details
1351f303e1 refs #5739 feat: try run test back and front
alexm added 1 commit 2024-01-16 08:01:26 +00:00
gitea/salix/pipeline/head This commit looks good Details
9bb0261897 refs #5739 feat: try run test back
alexm added 1 commit 2024-01-16 08:53:41 +00:00
gitea/salix/pipeline/head There was a failure building this commit Details
aefef1bfa6 refs #5739 feat: init.sh refactor(readme): add new commands
alexm added 1 commit 2024-01-16 09:02:48 +00:00
gitea/salix/pipeline/head There was a failure building this commit Details
6a55bc9227 refs #5739 fix: jenkins network
alexm added 1 commit 2024-01-16 09:04:29 +00:00
gitea/salix/pipeline/head There was a failure building this commit Details
548476d0e0 refs #5739 fix: jenkins network
alexm added 1 commit 2024-01-16 09:06:06 +00:00
gitea/salix/pipeline/head This commit looks good Details
1cc4890e6d refs #5739 fix: jenkins network
alexm added 1 commit 2024-01-16 14:08:43 +00:00
gitea/salix/pipeline/head This commit looks good Details
280e3c6760 refs #5739 refactor: front/docker and readme
alexm reviewed 2024-01-16 14:33:56 +00:00
Jenkinsfile
@ -7,6 +7,7 @@ pipeline {
environment {
PROJECT_NAME = 'salix'
STACK_NAME = "${env.PROJECT_NAME}-${env.BRANCH_NAME}"
STACK_NAME_LC= "${env.PROJECT_NAME}-${env.BRANCH_NAME}".toLowerCase()
alexm commented 2024-01-16 14:33:56 +00:00
Author
Member
Copy Link

Docker cuando crea la network por defecto le pone el nombre del stack en lowerCase.

Docker cuando crea la network por defecto le pone el nombre del stack en lowerCase.
alexm reviewed 2024-01-16 14:34:39 +00:00
back/tests.js Outdated
@ -32,3 +25,1 @@
port: container.dbConf.port
});
// dataSources.vn.port = 3308;
alexm commented 2024-01-16 14:34:39 +00:00
Author
Member
Copy Link

Quitar

Quitar
alexm added 1 commit 2024-01-17 07:09:35 +00:00
gitea/salix/pipeline/head There was a failure building this commit Details
5dc9062444 refs #5739 refactor: reset.sh and runTest.sh
alexm added 1 commit 2024-01-17 07:12:56 +00:00
gitea/salix/pipeline/head There was a failure building this commit Details
5af6e2bfb9 refs #5739 refactor: remove comments
alexm added 1 commit 2024-01-17 07:17:39 +00:00
gitea/salix/pipeline/head This commit looks good Details
da3fb0a13d refs #5739 fix: front does not depend on the back
alexm added 1 commit 2024-01-17 07:38:22 +00:00
gitea/salix/pipeline/head This commit looks good Details
9d29b9ec30 refs #5739 refactor(back/dockerFille): optimized
alexm added 1 commit 2024-01-17 07:43:23 +00:00
gitea/salix/pipeline/head This commit looks good Details
ebae32a545 refs #5739 try: test
alexm added 1 commit 2024-01-17 07:47:11 +00:00
gitea/salix/pipeline/head This commit looks good Details
4417003d73 refs #5739 try: test
alexm reviewed 2024-01-17 08:39:16 +00:00
init.sh
@ -0,0 +1,7 @@
sudo docker run --rm -it \
alexm commented 2024-01-17 08:39:16 +00:00
Author
Member
Copy Link

Genera los node_modules sin tener node instalado

Genera los node_modules sin tener node instalado
alexm reviewed 2024-01-17 08:39:38 +00:00
front/Dockerfile
@ -19,0 +32,4 @@
WORKDIR /salix
COPY front front
# RUN npm i -g jest
alexm commented 2024-01-17 08:39:38 +00:00
Author
Member
Copy Link

Quitar antes de mergear

Quitar antes de mergear
alexm reviewed 2024-01-17 08:40:41 +00:00
e2e/helpers/tests.js
@ -5,3 +5,3 @@
const axios = require('axios');
const Docker = require('../../db/docker.js');
// const Docker = require('../../db/docker.js');
alexm commented 2024-01-17 08:40:41 +00:00
Author
Member
Copy Link

Quitar antes de subir

Quitar antes de subir
alexm reviewed 2024-01-17 08:41:18 +00:00
e2e/Dockerfile
@ -0,0 +1,6 @@
FROM front
alexm commented 2024-01-17 08:41:18 +00:00
Author
Member
Copy Link

Este el borrare era un intento de poder tirar els e2e

Este el borrare era un intento de poder tirar els e2e
alexm reviewed 2024-01-17 08:43:01 +00:00
README.md
@ -49,3 +71,4 @@
# Or with NodeJS
$ npm run test:back
```
alexm commented 2024-01-17 08:43:01 +00:00
Author
Member
Copy Link

En els e2e tenim un problema pq si que fa falta tindre node instalat localment
Per a que puga executar:
node e2e/helpers/tests.js.

Puc seguir intentant vore si puc fer que vaja en docker en local

En els e2e tenim un problema pq si que fa falta tindre node instalat localment Per a que puga executar: `node e2e/helpers/tests.js`. Puc seguir intentant vore si puc fer que vaja en docker en local
alexm requested review from juan 2024-01-17 08:43:18 +00:00
alexm added 1 commit 2024-01-17 10:56:56 +00:00
gitea/salix/pipeline/head There was a failure building this commit Details
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
273dd35992 refs #5739 fix: local e2e
juan refused to review 2024-06-11 07:12:00 +00:00
Some checks failed
gitea/salix/pipeline/head There was a failure building this commit
Details
gitea/salix/pipeline/pr-dev There was a failure building this commit
Required
Details
This pull request has changes conflicting with the target branch.
  • Dockerfile
  • Jenkinsfile
  • README.md
  • back/Dockerfile
  • back/tests.js
  • e2e/helpers/tests.js
  • front/Dockerfile
  • gulpfile.js
  • loopback/locale/en.json
  • modules/route/back/models/routesMonitor.json
Sign in to join this conversation.
Reviewers
No reviewers
Labels
Clear labels   
CR / Tests passed

Unit tests and e2e passed

  
e2e

Implement e2e

  
Missing tests

Missing tests

  
Needs refactor

   
Simple

Simple check / No CR needed

No Label
CR / Tests passed
e2e
Missing tests
Needs refactor
Simple
Milestone
Clear milestone
No items
No Milestone
Assignees
Clear assignees
No Assignees
3 Participants
Notifications
Due Date
The due date is invalid or out of range. Please use the format 'yyyy-mm-dd'.

No due date set.

Dependencies

No dependencies set.

Reference: verdnatura/salix#1822
No description provided.
Delete Branch "5739-dockerRefactor"

Deleting a branch is permanent. Although the deleted branch may continue to exist for a short time before it actually gets removed, it CANNOT be undone in most cases. Continue?