Skip to content
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.

Commit 9b47af6

Browse files
committedMay 3, 2022
Update
1 parent 5ef2bf2 commit 9b47af6

File tree

76 files changed

+21160
-19331
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

76 files changed

+21160
-19331
lines changed
 

‎deploy/k8s/build-to-acr.services

-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
# List of {service-name}:{image-name}>{dockerfile-path} for the application
21
basket-api:basket.api>src/Services/Basket/Basket.API/Dockerfile
32
catalog-api:catalog.api>src/Services/Catalog/Catalog.API/Dockerfile
43
coupon-api:coupon.api>src/Services/Coupon/Coupon.API/Dockerfile

‎deploy/k8s/build-to-acr.sh

+5-17
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,14 @@
11
#!/bin/bash
22

3-
# Color theming
4-
if [ -f ~/clouddrive/aspnet-learn/deploy/k8s/theme.sh ]
5-
then
6-
. <(cat ~/clouddrive/aspnet-learn/deploy/k8s/theme.sh)
7-
fi
8-
93
echo
104
echo "Building images to ACR"
115
echo "======================"
126

13-
if [ -f ~/clouddrive/aspnet-learn-temp/create-acr-exports.txt ]
7+
if [ -f ~/clouddrive/source/create-acr-exports.txt ]
148
then
15-
eval $(cat ~/clouddrive/aspnet-learn-temp/create-acr-exports.txt)
9+
eval $(cat ~/clouddrive/source/create-acr-exports.txt)
1610
fi
1711

18-
pushd /src/deploy/k8s > /dev/null
19-
2012
if [ -z "$ESHOP_REGISTRY" ] || [ -z "$ESHOP_ACRNAME" ]
2113
then
2214
echo "One or more required environment variables are missing:"
@@ -49,7 +41,7 @@ else
4941
serviceList=${services//,/ }
5042
fi
5143

52-
pushd ../.. > /dev/null
44+
pushd ../..
5345

5446
for service in $serviceList
5547
do
@@ -61,11 +53,7 @@ do
6153

6254
echo
6355
echo "Building image \"$image\" for service \"$service\" with \"$dockerfile.acr\"..."
64-
serviceCmd="az acr build -r $ESHOP_ACRNAME -t $ESHOP_REGISTRY/$image:linux-latest -f $dockerfile.acr ."
65-
echo "${newline} > ${azCliCommandStyle}$serviceCmd${defaultTextStyle}${newline}"
66-
eval $serviceCmd
56+
az acr build -r $ESHOP_ACRNAME -t $ESHOP_REGISTRY/$image:linux-latest -f $dockerfile.acr .
6757
done
68-
69-
popd > /dev/null
7058

71-
popd > /dev/null
59+
popd

0 commit comments

Comments
 (0)
Please sign in to comment.