From ba9da00a7f6dc64b297500257d66d7c60ead1ad3 Mon Sep 17 00:00:00 2001 From: Moriz Wahl Date: Sat, 10 May 2025 07:08:39 +0200 Subject: [PATCH] correct copy path in dockerfile (#8519) --- backend/Dockerfile | 4 ++-- backend/tools/replace-constants.sh | 1 + .../_new/icons/svgs/reformer-basic-rights.svg | 5 +++++ .../_new/icons/svgs/reformer-child-protection.svg | 5 +++++ webapp/assets/_new/icons/svgs/reformer-corona.svg | 5 +++++ .../_new/icons/svgs/reformer-demonstrations.svg | 5 +++++ .../_new/icons/svgs/reformer-digital-euro.svg | 5 +++++ .../assets/_new/icons/svgs/reformer-education.svg | 5 +++++ webapp/assets/_new/icons/svgs/reformer-justice.svg | 5 +++++ webapp/assets/_new/icons/svgs/reformer-media.svg | 5 +++++ .../_new/icons/svgs/reformer-miscellaneous.svg | 13 +++++++++++++ .../_new/icons/svgs/reformer-monetary-system.svg | 5 +++++ webapp/assets/_new/icons/svgs/reformer-ngos.svg | 5 +++++ .../_new/icons/svgs/reformer-surveillance.svg | 5 +++++ .../_new/icons/svgs/reformer-transhumanism.svg | 5 +++++ webapp/assets/_new/icons/svgs/reformer-who.svg | 5 +++++ 16 files changed, 81 insertions(+), 2 deletions(-) create mode 100644 webapp/assets/_new/icons/svgs/reformer-basic-rights.svg create mode 100644 webapp/assets/_new/icons/svgs/reformer-child-protection.svg create mode 100755 webapp/assets/_new/icons/svgs/reformer-corona.svg create mode 100755 webapp/assets/_new/icons/svgs/reformer-demonstrations.svg create mode 100755 webapp/assets/_new/icons/svgs/reformer-digital-euro.svg create mode 100755 webapp/assets/_new/icons/svgs/reformer-education.svg create mode 100755 webapp/assets/_new/icons/svgs/reformer-justice.svg create mode 100755 webapp/assets/_new/icons/svgs/reformer-media.svg create mode 100644 webapp/assets/_new/icons/svgs/reformer-miscellaneous.svg create mode 100755 webapp/assets/_new/icons/svgs/reformer-monetary-system.svg create mode 100755 webapp/assets/_new/icons/svgs/reformer-ngos.svg create mode 100755 webapp/assets/_new/icons/svgs/reformer-surveillance.svg create mode 100755 webapp/assets/_new/icons/svgs/reformer-transhumanism.svg create mode 100755 webapp/assets/_new/icons/svgs/reformer-who.svg diff --git a/backend/Dockerfile b/backend/Dockerfile index e481da5a3..697277a00 100644 --- a/backend/Dockerfile +++ b/backend/Dockerfile @@ -21,9 +21,9 @@ CMD ["/bin/sh", "-c", "yarn install && yarn run dev"] FROM base AS build COPY . . ONBUILD COPY ./branding/constants/ src/config/tmp -ONBUILD RUN tools/replace-constants.sh # copy categories to brand them (use yarn prod:db:data:categories) -ONBUILD COPY branding/constants/ src/constants/ +ONBUILD COPY ./branding/constants/ src/constants/ +ONBUILD RUN tools/replace-constants.sh ONBUILD COPY ./branding/email/ src/middleware/helpers/email/ ONBUILD COPY ./branding/middlewares/ src/middleware/branding/ ONBUILD COPY ./branding/data/ src/db/data diff --git a/backend/tools/replace-constants.sh b/backend/tools/replace-constants.sh index e7cee6ee3..5454d3ae8 100755 --- a/backend/tools/replace-constants.sh +++ b/backend/tools/replace-constants.sh @@ -4,4 +4,5 @@ [ -f src/config/tmp/emails.js ] && mv src/config/tmp/emails.js src/config/emails.ts [ -f src/config/tmp/logos.js ] && mv src/config/tmp/logos.js src/config/logos.ts [ -f src/config/tmp/metadata.js ] && mv src/config/tmp/metadata.js src/config/metadata.ts +[ -f src/constants/categories.js ] && mv src/constants/categories.js src/constants/categories.ts exit 0 diff --git a/webapp/assets/_new/icons/svgs/reformer-basic-rights.svg b/webapp/assets/_new/icons/svgs/reformer-basic-rights.svg new file mode 100644 index 000000000..305e367ac --- /dev/null +++ b/webapp/assets/_new/icons/svgs/reformer-basic-rights.svg @@ -0,0 +1,5 @@ + + +book + + diff --git a/webapp/assets/_new/icons/svgs/reformer-child-protection.svg b/webapp/assets/_new/icons/svgs/reformer-child-protection.svg new file mode 100644 index 000000000..fcb5651f0 --- /dev/null +++ b/webapp/assets/_new/icons/svgs/reformer-child-protection.svg @@ -0,0 +1,5 @@ + + +child + + diff --git a/webapp/assets/_new/icons/svgs/reformer-corona.svg b/webapp/assets/_new/icons/svgs/reformer-corona.svg new file mode 100755 index 000000000..bddbcebcc --- /dev/null +++ b/webapp/assets/_new/icons/svgs/reformer-corona.svg @@ -0,0 +1,5 @@ + + +sun-o + + diff --git a/webapp/assets/_new/icons/svgs/reformer-demonstrations.svg b/webapp/assets/_new/icons/svgs/reformer-demonstrations.svg new file mode 100755 index 000000000..95e0d21d3 --- /dev/null +++ b/webapp/assets/_new/icons/svgs/reformer-demonstrations.svg @@ -0,0 +1,5 @@ + + +bullhorn + + diff --git a/webapp/assets/_new/icons/svgs/reformer-digital-euro.svg b/webapp/assets/_new/icons/svgs/reformer-digital-euro.svg new file mode 100755 index 000000000..cddb5775a --- /dev/null +++ b/webapp/assets/_new/icons/svgs/reformer-digital-euro.svg @@ -0,0 +1,5 @@ + + +university + + diff --git a/webapp/assets/_new/icons/svgs/reformer-education.svg b/webapp/assets/_new/icons/svgs/reformer-education.svg new file mode 100755 index 000000000..5d35226d3 --- /dev/null +++ b/webapp/assets/_new/icons/svgs/reformer-education.svg @@ -0,0 +1,5 @@ + + +graduation-cap + + diff --git a/webapp/assets/_new/icons/svgs/reformer-justice.svg b/webapp/assets/_new/icons/svgs/reformer-justice.svg new file mode 100755 index 000000000..f5e446fd2 --- /dev/null +++ b/webapp/assets/_new/icons/svgs/reformer-justice.svg @@ -0,0 +1,5 @@ + + +balance-scale + + diff --git a/webapp/assets/_new/icons/svgs/reformer-media.svg b/webapp/assets/_new/icons/svgs/reformer-media.svg new file mode 100755 index 000000000..7572021ba --- /dev/null +++ b/webapp/assets/_new/icons/svgs/reformer-media.svg @@ -0,0 +1,5 @@ + + +users + + diff --git a/webapp/assets/_new/icons/svgs/reformer-miscellaneous.svg b/webapp/assets/_new/icons/svgs/reformer-miscellaneous.svg new file mode 100644 index 000000000..07f8dbe3f --- /dev/null +++ b/webapp/assets/_new/icons/svgs/reformer-miscellaneous.svg @@ -0,0 +1,13 @@ + + + + diff --git a/webapp/assets/_new/icons/svgs/reformer-monetary-system.svg b/webapp/assets/_new/icons/svgs/reformer-monetary-system.svg new file mode 100755 index 000000000..04a116d2a --- /dev/null +++ b/webapp/assets/_new/icons/svgs/reformer-monetary-system.svg @@ -0,0 +1,5 @@ + + +money + + diff --git a/webapp/assets/_new/icons/svgs/reformer-ngos.svg b/webapp/assets/_new/icons/svgs/reformer-ngos.svg new file mode 100755 index 000000000..9d390e126 --- /dev/null +++ b/webapp/assets/_new/icons/svgs/reformer-ngos.svg @@ -0,0 +1,5 @@ + + +chain + + diff --git a/webapp/assets/_new/icons/svgs/reformer-surveillance.svg b/webapp/assets/_new/icons/svgs/reformer-surveillance.svg new file mode 100755 index 000000000..793620544 --- /dev/null +++ b/webapp/assets/_new/icons/svgs/reformer-surveillance.svg @@ -0,0 +1,5 @@ + + +camera + + diff --git a/webapp/assets/_new/icons/svgs/reformer-transhumanism.svg b/webapp/assets/_new/icons/svgs/reformer-transhumanism.svg new file mode 100755 index 000000000..e1ca6bde6 --- /dev/null +++ b/webapp/assets/_new/icons/svgs/reformer-transhumanism.svg @@ -0,0 +1,5 @@ + + +flask + + diff --git a/webapp/assets/_new/icons/svgs/reformer-who.svg b/webapp/assets/_new/icons/svgs/reformer-who.svg new file mode 100755 index 000000000..91bf9bf2b --- /dev/null +++ b/webapp/assets/_new/icons/svgs/reformer-who.svg @@ -0,0 +1,5 @@ + + +globe + +