djkato/saleor-dockerize-all-apps
1
1
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

small refactor

Browse source
This commit is contained in:
Djkáťo 2024-07-03 16:08:12 +02:00
parent 180dfb0286
commit b34ef8149b
4 changed files with 31 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

35
Makefile.toml
View file

@ -24,34 +24,44 @@ ALL_APPS = [
workspace = false workspace = false
alias = "build" alias = "build"
[tasks.update-repos]
workspace = false
script = '''
git submodule foreach --recursive git reset --hard
git submodule update --recursive --remote
'''
# Overrides the default build task # Overrides the default build task
[tasks.build] [tasks.build]
workspace = false workspace = false
alias = "build-all" alias = "build-all"
[tasks.build-all] [tasks.build-all]
workspace = false run_task = { name = [
dependencies = [ "delete-images",
# "delete-images",
"build-abandoned-checkouts", "build-abandoned-checkouts",
"build-stripe", "build-stripe",
"build-klarna", "build-klarna",
# "build-authorize-net", -- Error: 11.26 Type error: Cannot find module '../generated/graphql' or its corresponding type declarations. "build-authorize-net",
"build-avatax", "build-avatax",
# "build-cms-v2", -- Error: Unable to find 'schema-ast' "build-cms-v2",
# "build-crm", -- Error: Unable to find 'schema-ast' "build-crm",
"build-data-importer", "build-data-importer",
"build-emails-and-messages",
"build-invoices", "build-invoices",
"build-klaviyo", "build-klaviyo",
"build-products-feed", "build-products-feed",
"build-search", "build-search",
# "build-segment", -- Error: Unable to find 'schema-ast' "build-segment",
"build-slack", "build-slack",
"build-smtp", "build-smtp",
"build-taxjar", "build-taxjar",
], parallel = true }
] # segment: -- Error: Unable to find 'schema-ast'
# crm: -- Error: Unable to find 'schema-ast'
# cms-v2: -- Error: Unable to find 'schema-ast'
# avatax: -- x Could not find the following tasks in project: build
# authorize-net: -- Error: 11.26 Type error: Cannot find module '../generated/graphql' or its corresponding type declarations.
workspace = false
[tasks.apply-changes] [tasks.apply-changes]
workspace = false workspace = false
@ -80,8 +90,9 @@ docker push ${CONTAINER_PUSH_URL}/saleor-app-${APP}
[tasks.delete-images] [tasks.delete-images]
workspace = false workspace = false
script = ''' script = '''
for i in ${ALL_APPS[*]}; do ALL_IMAGES=$(docker images -qa --filter "label=src=saleor-dockerize-all-apps" --format "{{.Repository}}:{{.Tag}}")
docker rmi -f $(docker image ls -q --filter=label=service=saleor-app-$i) 2>&1 || true for i in ${ALL_IMAGES[*]}; do
docker rmi -f $i 2>&1 || true
done done
''' '''

4
changes.sh
View file

@ -5,7 +5,7 @@ REDIS_APL_PATH="$CURR_PWD/changes/snippets/redis_apl.ts"
OLD_REDIS_APL_PATH="$CURR_PWD/changes/snippets/redis_apl_old_sdk.ts" OLD_REDIS_APL_PATH="$CURR_PWD/changes/snippets/redis_apl_old_sdk.ts"
APPS_DOCKERFILE_PATH="$CURR_PWD/apps.Dockerfile" APPS_DOCKERFILE_PATH="$CURR_PWD/apps.Dockerfile"
OTHER_DOCKERFILE_PATH="$CURR_PWD/other.Dockerfile" OTHER_DOCKERFILE_PATH="$CURR_PWD/other.Dockerfile"
DOCKERIGNORE_PATH = "$CURR_PWD/.dockerignore" DOCKERIGNORE_PATH="$CURR_PWD/.dockerignore"
app_paths=( app_paths=(
"apps/apps/cms-v2" "apps/apps/cms-v2"
@ -74,7 +74,7 @@ find ./all_apps/apps -name "saleor-app.ts" -exec cargo run --package modify-sale
echo "pached all_apps/apps/**/saleor-app.ts" echo "pached all_apps/apps/**/saleor-app.ts"
find ./all_apps/apps -name "next.config.js" -exec cargo run --package modify-next-config -- {} \; >/dev/null 2>&1 find ./all_apps/apps -name "next.config.js" -exec cargo run --package modify-next-config -- {} \; >/dev/null 2>&1
echo "pached all_apps/apps/**/saleor-app.ts" echo "pached all_apps/apps/**/next.config.js"
find ./all_apps/saleor-app-abandoned-checkouts -name "saleor-app.ts" -exec cargo run --package modify-saleor-app -- {} \; >/dev/null 2>&1 find ./all_apps/saleor-app-abandoned-checkouts -name "saleor-app.ts" -exec cargo run --package modify-saleor-app -- {} \; >/dev/null 2>&1
echo "pached all_apps/saleor-app-abandoned-checkouts/**/saleor-app.ts" echo "pached all_apps/saleor-app-abandoned-checkouts/**/saleor-app.ts"

2
changes/snippets/import-path-app-next.config.js
View file

@ -1 +1 @@
const path = require("path"); import * as path from "path";

9
emails.test.env
View file

@ -1,6 +1,7 @@
REDIS_URL=redis://redis-apl:6379/1 REDIS_URL=redis://localhost:6380/2
PORT=3010
APL=redis APL=redis
SECRET_KEY=idS8Oedýžfmg90S87Edfgnm90S87Dmfgiosuhbfs SECRET_KEY=idS8Oedýžfmg90S87Edfgnm90S87Dmfgiosuhbfs
APP_IFRAME_BASE_URL=https://app-emails.kremik.sk APP_IFRAME_BASE_URL=http://10.100.110.21:3010
APP_API_BASE_URL=https://app-emails.kremik.sk APP_API_BASE_URL=http://10.100.110.21:3010
APP_LOG_LEVEL=info APP_LOG_LEVEL=trace