@leverege/build-tools 2.54.0-beta.2 → 2.54.1
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/package.json +1 -1
- package/src/build-and-push.sh +2 -7
package/package.json
CHANGED
package/src/build-and-push.sh
CHANGED
|
@@ -4,8 +4,7 @@ application_name=$(awk -F'"' '/\[(tool\.poetry|project)\]/{flag=1;next} flag==1
|
|
|
4
4
|
application_version=$(awk -F'"' '/\[(tool\.poetry|project)\]/{flag=1;next} flag==1 && /^version = /{ print $2; exit }' ./pyproject.toml)
|
|
5
5
|
gcp_project_id=$(awk -F'"' '/\[tool\.docker\]/{flag=1;next} flag==1 && /^gcp-project-id = /{ print $2; exit }' ./pyproject.toml)
|
|
6
6
|
gcp_repository_name=$(awk -F'"' '/\[tool\.docker\]/{flag=1;next} flag==1 && /^gcp-repository-name = /{ print $2; exit }' ./pyproject.toml)
|
|
7
|
-
platform=$(awk -F'[][]' '/\[tool\.docker\]/{flag=1;next} flag==1 && /^platform *=/ { gsub(/"/, "", $2); print $2; exit }' ./pyproject.toml)
|
|
8
|
-
|
|
7
|
+
platform=$(awk -F'[][]' '/\[tool\.docker\]/{flag=1;next} flag==1 && /^platform *=/ { gsub(/"/, "", $2); gsub(/, /, ",", $2); print $2; exit }' ./pyproject.toml)
|
|
9
8
|
# Check if the platform is empty
|
|
10
9
|
if [ -z "$platform" ]; then
|
|
11
10
|
platform="linux/amd64,linux/arm64"
|
|
@@ -47,9 +46,7 @@ export GCLOUD_ACCESS_TOKEN=$(gcloud auth print-access-token)
|
|
|
47
46
|
|
|
48
47
|
if [ "$is_stable_release" = "true" ]; then
|
|
49
48
|
docker buildx build \
|
|
50
|
-
--platform $platform
|
|
51
|
-
--cache-from type=local,src=$cache_path \
|
|
52
|
-
--cache-to type=local,dest=$cache_path \
|
|
49
|
+
--platform $platform \
|
|
53
50
|
--build-arg APPLICATION_NAME=$application_name \
|
|
54
51
|
--build-arg APPLICATION_VERSION=$application_version \
|
|
55
52
|
--secret id=token,env=GCLOUD_ACCESS_TOKEN \
|
|
@@ -61,8 +58,6 @@ if [ "$is_stable_release" = "true" ]; then
|
|
|
61
58
|
else
|
|
62
59
|
docker buildx build \
|
|
63
60
|
--platform $platform \
|
|
64
|
-
--cache-from type=local,src=$cache_path \
|
|
65
|
-
--cache-to type=local,dest=$cache_path \
|
|
66
61
|
--build-arg APPLICATION_NAME=$application_name \
|
|
67
62
|
--build-arg APPLICATION_VERSION=$application_version \
|
|
68
63
|
--secret id=token,env=GCLOUD_ACCESS_TOKEN \
|