From 031c9c370b801974fd235547ae73a794ed0843b8 Mon Sep 17 00:00:00 2001 From: Ulf Gebhardt Date: Fri, 2 Jun 2023 11:08:08 +0200 Subject: [PATCH 1/8] copy files in external script --- backend/package.json | 2 +- backend/scripts/build.copy.files.sh | 24 ++++++++++++++++++++++++ 2 files changed, 25 insertions(+), 1 deletion(-) create mode 100755 backend/scripts/build.copy.files.sh diff --git a/backend/package.json b/backend/package.json index 9e0e3b72e..549f2d1ca 100644 --- a/backend/package.json +++ b/backend/package.json @@ -11,7 +11,7 @@ "__migrate": "migrate --compiler 'js:@babel/register' --migrations-dir ./src/db/migrations", "prod:migrate": "migrate --migrations-dir ./build/db/migrations --store ./build/db/migrate/store.js", "start": "node build/", - "build": "tsc && mkdir -p build/middleware/helpers/email/templates/ && cp -r src/middleware/helpers/email/templates/*.html build/middleware/helpers/email/templates/ && mkdir -p build/middleware/helpers/email/templates/en/ && cp -r src/middleware/helpers/email/templates/en/*.html build/middleware/helpers/email/templates/en/ && mkdir -p build/middleware/helpers/email/templates/de/ && cp -r src/middleware/helpers/email/templates/de/*.html build/middleware/helpers/email/templates/de/ && mkdir -p build/schema/types/ && cp -r src/schema/types/*.gql build/schema/types/ && mkdir -p build/schema/types/enum/ && cp -r src/schema/types/enum/*.gql build/schema/types/enum/ && mkdir -p build/schema/types/scalar/ && cp -r src/schema/types/scalar/*.gql build/schema/types/scalar/ && mkdir -p build/schema/types/type/ && cp -r src/schema/types/type/*.gql build/schema/types/type/", + "build": "tsc && ./scripts/build.copy.files.sh", "dev": "nodemon --exec ts-node src/ -e js,ts,gql", "dev:debug": "nodemon --exec babel-node --inspect=0.0.0.0:9229 src/ -e js,gql", "lint": "eslint src --config .eslintrc.js", diff --git a/backend/scripts/build.copy.files.sh b/backend/scripts/build.copy.files.sh new file mode 100755 index 000000000..773177ec4 --- /dev/null +++ b/backend/scripts/build.copy.files.sh @@ -0,0 +1,24 @@ +#!/bin/bash + +# html files +mkdir -p build/middleware/helpers/email/templates/ +cp -r src/middleware/helpers/email/templates/*.html build/middleware/helpers/email/templates/ + +mkdir -p build/middleware/helpers/email/templates/en/ +cp -r src/middleware/helpers/email/templates/en/*.html build/middleware/helpers/email/templates/en/ + +mkdir -p build/middleware/helpers/email/templates/de/ +cp -r src/middleware/helpers/email/templates/de/*.html build/middleware/helpers/email/templates/de/ + +# gql files +mkdir -p build/schema/types/ +cp -r src/schema/types/*.gql build/schema/types/ + +mkdir -p build/schema/types/enum/ +cp -r src/schema/types/enum/*.gql build/schema/types/enum/ + +mkdir -p build/schema/types/scalar/ +cp -r src/schema/types/scalar/*.gql build/schema/types/scalar/ + +mkdir -p build/schema/types/type/ +cp -r src/schema/types/type/*.gql build/schema/types/type/ \ No newline at end of file From 0954951e2661392cfd572f8af869b541d023d2e3 Mon Sep 17 00:00:00 2001 From: Ulf Gebhardt Date: Fri, 2 Jun 2023 12:11:42 +0200 Subject: [PATCH 2/8] removed ./ --- backend/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/backend/package.json b/backend/package.json index 549f2d1ca..c3a45cbe7 100644 --- a/backend/package.json +++ b/backend/package.json @@ -11,7 +11,7 @@ "__migrate": "migrate --compiler 'js:@babel/register' --migrations-dir ./src/db/migrations", "prod:migrate": "migrate --migrations-dir ./build/db/migrations --store ./build/db/migrate/store.js", "start": "node build/", - "build": "tsc && ./scripts/build.copy.files.sh", + "build": "tsc && scripts/build.copy.files.sh", "dev": "nodemon --exec ts-node src/ -e js,ts,gql", "dev:debug": "nodemon --exec babel-node --inspect=0.0.0.0:9229 src/ -e js,gql", "lint": "eslint src --config .eslintrc.js", From f4f016265a736efc7aadac458989b8eb7b723e6d Mon Sep 17 00:00:00 2001 From: Ulf Gebhardt Date: Fri, 2 Jun 2023 12:18:08 +0200 Subject: [PATCH 3/8] capsulate in /bin/sh --- backend/Dockerfile | 2 +- backend/package.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/backend/Dockerfile b/backend/Dockerfile index fc15aca63..fc6c1f4b3 100644 --- a/backend/Dockerfile +++ b/backend/Dockerfile @@ -74,7 +74,7 @@ FROM code as build # yarn install RUN yarn install --production=false --frozen-lockfile --non-interactive # yarn build -RUN yarn run build +RUN /bin/sh -c "yarn run build" ################################################################################## # TEST ########################################################################### diff --git a/backend/package.json b/backend/package.json index c3a45cbe7..549f2d1ca 100644 --- a/backend/package.json +++ b/backend/package.json @@ -11,7 +11,7 @@ "__migrate": "migrate --compiler 'js:@babel/register' --migrations-dir ./src/db/migrations", "prod:migrate": "migrate --migrations-dir ./build/db/migrations --store ./build/db/migrate/store.js", "start": "node build/", - "build": "tsc && scripts/build.copy.files.sh", + "build": "tsc && ./scripts/build.copy.files.sh", "dev": "nodemon --exec ts-node src/ -e js,ts,gql", "dev:debug": "nodemon --exec babel-node --inspect=0.0.0.0:9229 src/ -e js,gql", "lint": "eslint src --config .eslintrc.js", From 987e204ff9e819a1494002c74e8537a6d365f527 Mon Sep 17 00:00:00 2001 From: Ulf Gebhardt Date: Fri, 2 Jun 2023 12:24:18 +0200 Subject: [PATCH 4/8] remove all script functionality --- backend/scripts/build.copy.files.sh | 30 ++++++++++++++--------------- yarn.lock | 13 +++++++++---- 2 files changed, 24 insertions(+), 19 deletions(-) diff --git a/backend/scripts/build.copy.files.sh b/backend/scripts/build.copy.files.sh index 773177ec4..2cb286238 100755 --- a/backend/scripts/build.copy.files.sh +++ b/backend/scripts/build.copy.files.sh @@ -1,24 +1,24 @@ -#!/bin/bash +##!/bin/bash # html files -mkdir -p build/middleware/helpers/email/templates/ -cp -r src/middleware/helpers/email/templates/*.html build/middleware/helpers/email/templates/ +#mkdir -p build/middleware/helpers/email/templates/ +#cp -r src/middleware/helpers/email/templates/*.html build/middleware/helpers/email/templates/ -mkdir -p build/middleware/helpers/email/templates/en/ -cp -r src/middleware/helpers/email/templates/en/*.html build/middleware/helpers/email/templates/en/ +#mkdir -p build/middleware/helpers/email/templates/en/ +#cp -r src/middleware/helpers/email/templates/en/*.html build/middleware/helpers/email/templates/en/ -mkdir -p build/middleware/helpers/email/templates/de/ -cp -r src/middleware/helpers/email/templates/de/*.html build/middleware/helpers/email/templates/de/ +#mkdir -p build/middleware/helpers/email/templates/de/ +#cp -r src/middleware/helpers/email/templates/de/*.html build/middleware/helpers/email/templates/de/ # gql files -mkdir -p build/schema/types/ -cp -r src/schema/types/*.gql build/schema/types/ +#mkdir -p build/schema/types/ +#cp -r src/schema/types/*.gql build/schema/types/ -mkdir -p build/schema/types/enum/ -cp -r src/schema/types/enum/*.gql build/schema/types/enum/ +#mkdir -p build/schema/types/enum/ +#cp -r src/schema/types/enum/*.gql build/schema/types/enum/ -mkdir -p build/schema/types/scalar/ -cp -r src/schema/types/scalar/*.gql build/schema/types/scalar/ +#mkdir -p build/schema/types/scalar/ +#cp -r src/schema/types/scalar/*.gql build/schema/types/scalar/ -mkdir -p build/schema/types/type/ -cp -r src/schema/types/type/*.gql build/schema/types/type/ \ No newline at end of file +#mkdir -p build/schema/types/type/ +#cp -r src/schema/types/type/*.gql build/schema/types/type/ \ No newline at end of file diff --git a/yarn.lock b/yarn.lock index a2edb2677..4e69a0aaa 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1233,10 +1233,10 @@ debug "^3.1.0" lodash.once "^4.1.1" -"@faker-js/faker@5.1.0": - version "5.1.0" - resolved "https://registry.yarnpkg.com/@faker-js/faker/-/faker-5.1.0.tgz#cee1d77ada0d0dbbe77201d18b1ebabf432d9c0f" - integrity sha512-0VonSKh7fBCqvY+V2FLN2ZW4pR4ZtWJalWmwSaiaB7yK7y4qp8vDfuaq9QdLjf/cdZGx3M7Wc4Q+x4fZHxI21Q== +"@faker-js/faker@7.6.0": + version "7.6.0" + resolved "https://registry.yarnpkg.com/@faker-js/faker/-/faker-7.6.0.tgz#9ea331766084288634a9247fcd8b84f16ff4ba07" + integrity sha512-XK6BTq1NDMo9Xqw/YkYyGjSsg44fbNwYRx7QK2CuoQgyy+f1rrTDHoExVM5PsyXCtfl2vs2vVJ0MN0yN6LppRw== "@hapi/address@2.x.x": version "2.0.0" @@ -2624,6 +2624,11 @@ cypress-file-upload@^3.5.3: resolved "https://registry.yarnpkg.com/cypress-file-upload/-/cypress-file-upload-3.5.3.tgz#cd706485de3fb2cbd4a8c2dd90fe96d537bb4311" integrity sha512-S/czzqAj1BYz6Xxnfpx2aSc6hXsj76fd8/iuycJ2RxoxCcQMliw8eQV0ugzVlkzr1GD5dKGviNFGYqv3nRJ+Tg== +cypress-network-idle@^1.14.2: + version "1.14.2" + resolved "https://registry.yarnpkg.com/cypress-network-idle/-/cypress-network-idle-1.14.2.tgz#0837100861feeb5a18f4c2d9815be079f8590f4d" + integrity sha512-xAdR8dH58KFPv8eCDWjviScITrJOcUpuMXYfYTc175nk2/NvnJ+I6ylSn1CM7yZmoV/gLbFa36QLiH5NfNEaLQ== + cypress@^7.0.1: version "7.0.1" resolved "https://registry.yarnpkg.com/cypress/-/cypress-7.0.1.tgz#8603f84d828fd4c5462a856f55cef5642e4ce573" From 6aaa51e388e5bd041453067a3864bc6585fc9c08 Mon Sep 17 00:00:00 2001 From: Ulf Gebhardt Date: Fri, 2 Jun 2023 12:32:20 +0200 Subject: [PATCH 5/8] use sh instead of bash --- backend/scripts/build.copy.files.sh | 30 ++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/backend/scripts/build.copy.files.sh b/backend/scripts/build.copy.files.sh index 2cb286238..85022ba9b 100755 --- a/backend/scripts/build.copy.files.sh +++ b/backend/scripts/build.copy.files.sh @@ -1,24 +1,24 @@ -##!/bin/bash +#!/bin/sh # html files -#mkdir -p build/middleware/helpers/email/templates/ -#cp -r src/middleware/helpers/email/templates/*.html build/middleware/helpers/email/templates/ +mkdir -p build/middleware/helpers/email/templates/ +cp -r src/middleware/helpers/email/templates/*.html build/middleware/helpers/email/templates/ -#mkdir -p build/middleware/helpers/email/templates/en/ -#cp -r src/middleware/helpers/email/templates/en/*.html build/middleware/helpers/email/templates/en/ +mkdir -p build/middleware/helpers/email/templates/en/ +cp -r src/middleware/helpers/email/templates/en/*.html build/middleware/helpers/email/templates/en/ -#mkdir -p build/middleware/helpers/email/templates/de/ -#cp -r src/middleware/helpers/email/templates/de/*.html build/middleware/helpers/email/templates/de/ +mkdir -p build/middleware/helpers/email/templates/de/ +cp -r src/middleware/helpers/email/templates/de/*.html build/middleware/helpers/email/templates/de/ # gql files -#mkdir -p build/schema/types/ -#cp -r src/schema/types/*.gql build/schema/types/ +mkdir -p build/schema/types/ +cp -r src/schema/types/*.gql build/schema/types/ -#mkdir -p build/schema/types/enum/ -#cp -r src/schema/types/enum/*.gql build/schema/types/enum/ +mkdir -p build/schema/types/enum/ +cp -r src/schema/types/enum/*.gql build/schema/types/enum/ -#mkdir -p build/schema/types/scalar/ -#cp -r src/schema/types/scalar/*.gql build/schema/types/scalar/ +mkdir -p build/schema/types/scalar/ +cp -r src/schema/types/scalar/*.gql build/schema/types/scalar/ -#mkdir -p build/schema/types/type/ -#cp -r src/schema/types/type/*.gql build/schema/types/type/ \ No newline at end of file +mkdir -p build/schema/types/type/ +cp -r src/schema/types/type/*.gql build/schema/types/type/ \ No newline at end of file From b3f6d58471096556f7b3822f2d7c7161bd8e4a6a Mon Sep 17 00:00:00 2001 From: Ulf Gebhardt Date: Sat, 3 Jun 2023 03:29:47 +0200 Subject: [PATCH 6/8] remove scripts folder from docker ignore list, convert script back to bash --- backend/.dockerignore | 1 - backend/scripts/build.copy.files.sh | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/backend/.dockerignore b/backend/.dockerignore index d694f0d21..a0883bf4d 100644 --- a/backend/.dockerignore +++ b/backend/.dockerignore @@ -12,7 +12,6 @@ docker-compose*.yml ./*.log node_modules/ -scripts/ build/ maintenance-worker/ diff --git a/backend/scripts/build.copy.files.sh b/backend/scripts/build.copy.files.sh index 85022ba9b..773177ec4 100755 --- a/backend/scripts/build.copy.files.sh +++ b/backend/scripts/build.copy.files.sh @@ -1,4 +1,4 @@ -#!/bin/sh +#!/bin/bash # html files mkdir -p build/middleware/helpers/email/templates/ From 8dbdcb4d195398f63f9ad3a1a05b6b45fa0a8082 Mon Sep 17 00:00:00 2001 From: Ulf Gebhardt Date: Sat, 3 Jun 2023 03:44:50 +0200 Subject: [PATCH 7/8] we need to use sh instead of bash --- backend/scripts/build.copy.files.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/backend/scripts/build.copy.files.sh b/backend/scripts/build.copy.files.sh index 773177ec4..85022ba9b 100755 --- a/backend/scripts/build.copy.files.sh +++ b/backend/scripts/build.copy.files.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/bin/sh # html files mkdir -p build/middleware/helpers/email/templates/ From 01343a65443e640821e6207f26468e0b13b72076 Mon Sep 17 00:00:00 2001 From: Ulf Gebhardt Date: Sat, 3 Jun 2023 03:50:02 +0200 Subject: [PATCH 8/8] fixed yarn lock --- yarn.lock | 5 ----- 1 file changed, 5 deletions(-) diff --git a/yarn.lock b/yarn.lock index 4e69a0aaa..3dfc61609 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2624,11 +2624,6 @@ cypress-file-upload@^3.5.3: resolved "https://registry.yarnpkg.com/cypress-file-upload/-/cypress-file-upload-3.5.3.tgz#cd706485de3fb2cbd4a8c2dd90fe96d537bb4311" integrity sha512-S/czzqAj1BYz6Xxnfpx2aSc6hXsj76fd8/iuycJ2RxoxCcQMliw8eQV0ugzVlkzr1GD5dKGviNFGYqv3nRJ+Tg== -cypress-network-idle@^1.14.2: - version "1.14.2" - resolved "https://registry.yarnpkg.com/cypress-network-idle/-/cypress-network-idle-1.14.2.tgz#0837100861feeb5a18f4c2d9815be079f8590f4d" - integrity sha512-xAdR8dH58KFPv8eCDWjviScITrJOcUpuMXYfYTc175nk2/NvnJ+I6ylSn1CM7yZmoV/gLbFa36QLiH5NfNEaLQ== - cypress@^7.0.1: version "7.0.1" resolved "https://registry.yarnpkg.com/cypress/-/cypress-7.0.1.tgz#8603f84d828fd4c5462a856f55cef5642e4ce573"