Skip to content

Commit 8405fa5

Browse files
1iveowl1iveowl
authored
Merge pull request #253 from 1iveowl/main
Upgrading to .NET 8 - adding Apple Silicon Fixes and dependency fixes
2 parents 17e7d47 + b5ac372 commit 8405fa5

File tree

35 files changed

+151
-65
lines changed

35 files changed

+151
-65
lines changed

‎.github/workflows/admin-service-api-deploy.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,9 @@ permissions:
99
contents: read
1010

1111
env:
12-
AZURE_WEBAPP_NAME: 'admin-api-asdk-test-83sx' # set this to your application's name
12+
AZURE_WEBAPP_NAME: 'admin-api-asdk-test-v23y' # set this to your application's name
1313
AZURE_WEBAPP_PACKAGE_PATH: . # set this to the path to your web app project, defaults to the repository root
14-
DOTNET_VERSION: 7.x.x
14+
DOTNET_VERSION: 8.x.x
1515
PROJECT_DIR: ./src/Saas.Admin/Saas.Admin.Service
1616
PROJECT_PATH: ./src/Saas.Admin/Saas.Admin.Service/Saas.Admin.Service.csproj
1717
OUTPUT_PATH: ./publish/admin-api

‎.github/workflows/permissions-api-deploy.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,9 @@ permissions:
99
contents: read
1010

1111
env:
12-
AZURE_WEBAPP_NAME: 'api-permission-asdk-test-83sx' # set this to your application's name
12+
AZURE_WEBAPP_NAME: 'api-permission-asdk-test-v23y' # set this to your application's name
1313
AZURE_WEBAPP_PACKAGE_PATH: . # set this to the path to your web app project, defaults to the repository root
14-
DOTNET_VERSION: 7.x.x
14+
DOTNET_VERSION: 8.x.x
1515
PROJECT_DIR: ./src/Saas.Identity/Saas.Permissions/Saas.Permissions.Service_v1.1
1616
PROJECT_PATH: ./src/Saas.Identity/Saas.Permissions/Saas.Permissions.Service_v1.1/Saas.Permissions.Service.csproj
1717
OUTPUT_PATH: ./publish/api-permission

‎.github/workflows/saas-app-deploy.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,9 @@ permissions:
99
contents: read
1010

1111
env:
12-
AZURE_WEBAPP_NAME: 'saas-app-asdk-test-83sx' # set this to your application's name
12+
AZURE_WEBAPP_NAME: 'saas-app-asdk-test-v23y' # set this to your application's name
1313
AZURE_WEBAPP_PACKAGE_PATH: . # set this to the path to your web app project, defaults to the repository root
14-
DOTNET_VERSION: 7.x.x
14+
DOTNET_VERSION: 8.x.x
1515
PROJECT_DIR: ./src/Saas.Application/Saas.Application.Web
1616
PROJECT_PATH: ./src/Saas.Application/Saas.Application.Web/Saas.Application.Web.csproj
1717
OUTPUT_PATH: ./publish/saas-app

‎.github/workflows/signup-administration-deploy.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,9 @@ permissions:
99
contents: read
1010

1111
env:
12-
AZURE_WEBAPP_NAME: 'signupadmin-app-asdk-test-83sx' # set this to your application's name
12+
AZURE_WEBAPP_NAME: 'signupadmin-app-asdk-test-v23y' # set this to your application's name
1313
AZURE_WEBAPP_PACKAGE_PATH: . # set this to the path to your web app project, defaults to the repository root
14-
DOTNET_VERSION: 7.x.x
14+
DOTNET_VERSION: 8.x.x
1515
PROJECT_DIR: ./src/Saas.SignupAdministration/Saas.SignupAdministration.Web
1616
PROJECT_PATH: ./src/Saas.SignupAdministration/Saas.SignupAdministration.Web/Saas.SignupAdministration.Web.csproj
1717
OUTPUT_PATH: ./publish/signupadmin

‎src/Saas.Admin/Saas.Admin.Client/Saas.Admin.Client.csproj

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFramework>net7.0</TargetFramework>
4+
<TargetFramework>net8.0</TargetFramework>
55
<ImplicitUsings>enable</ImplicitUsings>
66
<Nullable>enable</Nullable>
77
<Configurations>Debug;Release;Multi Debug</Configurations>
88
</PropertyGroup>
99

1010
<ItemGroup>
11-
<PackageReference Include="Microsoft.Identity.Web" Version="2.15.3" />
11+
<PackageReference Include="Microsoft.Identity.Web" Version="2.16.0" />
1212
</ItemGroup>
1313

1414
<ItemGroup>

‎src/Saas.Admin/Saas.Admin.Service/Saas.Admin.Service.csproj

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk.Web">
22

33
<PropertyGroup>
4-
<TargetFramework>net7.0</TargetFramework>
4+
<TargetFramework>net8.0</TargetFramework>
55
<Nullable>enable</Nullable>
66
<ImplicitUsings>enable</ImplicitUsings>
77
<UserSecretsId>aspnet-Saas.Admin.Service-5358E0C3-EA51-44EA-B381-CA2F9D9710D3</UserSecretsId>
@@ -11,11 +11,11 @@
1111
</PropertyGroup>
1212

1313
<ItemGroup>
14-
<PackageReference Include="Azure.Extensions.AspNetCore.Configuration.Secrets" Version="1.2.2" />
14+
<PackageReference Include="Azure.Extensions.AspNetCore.Configuration.Secrets" Version="1.3.0" />
1515
<PackageReference Include="Dawn.Guard" Version="1.12.0" />
16-
<PackageReference Include="Microsoft.ApplicationInsights.AspNetCore" Version="2.21.0" />
17-
<PackageReference Include="Microsoft.Extensions.Configuration.AzureAppConfiguration" Version="6.1.1" />
18-
<PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="7.0.13" />
16+
<PackageReference Include="Microsoft.ApplicationInsights.AspNetCore" Version="2.22.0" />
17+
<PackageReference Include="Microsoft.Extensions.Configuration.AzureAppConfiguration" Version="7.0.0" />
18+
<PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="8.0.0" />
1919
</ItemGroup>
2020
<ItemGroup>
2121
<AssemblyAttribute Include="System.Runtime.CompilerServices.InternalsVisibleTo">

‎src/Saas.Admin/deployment/act/deploy.sh

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@ container_deployment_dir="/asdk/src/Saas.Admin/deployment"
1717

1818
# running the './act/script/patch-app-name.sh' script using our ASDK deployment script container - i.e., not the act container
1919
docker run \
20+
--platform linux/amd64 \
2021
--interactive \
2122
--tty \
2223
--rm \

‎src/Saas.Admin/deployment/act/workflows/admin-service-api-deploy-debug.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,9 @@ permissions:
1010

1111
env:
1212
APP_NAME: admin-api
13-
AZURE_WEBAPP_NAME: admin-api-asdk-test-83sx # set this to your application's name
13+
AZURE_WEBAPP_NAME: admin-api-asdk-test-v23y # set this to your application's name
1414
AZURE_WEBAPP_PACKAGE_PATH: . # set this to the path to your web app project, defaults to the repository root
15-
DOTNET_VERSION: 7.x.x
15+
DOTNET_VERSION: 8.x.x
1616
PROJECT_DIR: ./src/Saas.Admin/Saas.Admin.Service
1717
PROJECT_PATH: ${{ env.PROJECT_DIR }}/Saas.Admin.Service.csproj
1818
PUBLISH_PATH: ./publish

‎src/Saas.Admin/deployment/run.sh

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ container_deployment_dir="/asdk/src/Saas.Admin/deployment"
1111
# using volumes '--volume' to mount only the needed directories to the container.
1212
# using ':ro' to make scrip directories etc. read-only. Only config and log directories are writable.
1313
docker run \
14+
--platform linux/amd64 \
1415
--interactive \
1516
--tty \
1617
--rm \

‎src/Saas.Application/Saas.Application.Web/Saas.Application.Web.csproj

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,18 @@
11
<Project Sdk="Microsoft.NET.Sdk.Web">
22

33
<PropertyGroup>
4-
<TargetFramework>net7.0</TargetFramework>
4+
<TargetFramework>net8.0</TargetFramework>
55
<Nullable>enable</Nullable>
66
<ImplicitUsings>enable</ImplicitUsings>
77
<UserSecretsId>a45ad9f7-37e3-4dc7-bf2c-9f1f3e449cba</UserSecretsId>
88
<Configurations>Debug;Release;Multi Debug</Configurations>
99
</PropertyGroup>
1010

1111
<ItemGroup>
12-
<PackageReference Include="Microsoft.Extensions.Configuration.AzureAppConfiguration" Version="6.1.1" />
13-
<PackageReference Include="Microsoft.ApplicationInsights.AspNetCore" Version="2.21.0" />
14-
<PackageReference Include="Microsoft.Identity.Web.UI" Version="2.15.3" />
15-
<PackageReference Include="Microsoft.VisualStudio.Web.CodeGeneration.Design" Version="7.0.11" />
12+
<PackageReference Include="Microsoft.Extensions.Configuration.AzureAppConfiguration" Version="7.0.0" />
13+
<PackageReference Include="Microsoft.ApplicationInsights.AspNetCore" Version="2.22.0" />
14+
<PackageReference Include="Microsoft.Identity.Web.UI" Version="2.16.0" />
15+
<PackageReference Include="Microsoft.VisualStudio.Web.CodeGeneration.Design" Version="8.0.0" />
1616
</ItemGroup>
1717

1818
<ItemGroup>

‎src/Saas.Application/deployment/act/deploy.sh

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@ container_deployment_dir="/asdk/src/Saas.Application/deployment"
1717

1818
# running the './act/script/patch-app-name.sh' script using our ASDK deployment script container - i.e., not the act container
1919
docker run \
20+
--platform linux/amd64 \
2021
--interactive \
2122
--tty \
2223
--rm \

‎src/Saas.Application/deployment/act/workflows/saas-app-deploy-debug.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,9 @@ permissions:
1010

1111
env:
1212
APP_NAME: saas-app
13-
AZURE_WEBAPP_NAME: saas-app-asdk-test-83sx # set this to your application's name
13+
AZURE_WEBAPP_NAME: saas-app-asdk-test-v23y # set this to your application's name
1414
AZURE_WEBAPP_PACKAGE_PATH: . # set this to the path to your web app project, defaults to the repository root
15-
DOTNET_VERSION: 7.x.x
15+
DOTNET_VERSION: 8.x.x
1616
PROJECT_DIR: ./src/Saas.Application/Saas.Application.Web
1717
PROJECT_PATH: ${{ env.PROJECT_DIR }}/Saas.Application.Web.csproj
1818
PUBLISH_PATH: ./publish

‎src/Saas.Application/deployment/run.sh

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ container_deployment_dir="/asdk/src/Saas.Application/deployment"
1111
# using volumes '--volume' to mount only the needed directories to the container.
1212
# using ':ro' to make scrip directories etc. read-only. Only config and log directories are writable.
1313
docker run \
14+
--platform linux/amd64 \
1415
--interactive \
1516
--tty \
1617
--rm \

‎src/Saas.Identity/Saas.IdentityProvider/deployment/bicep/.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
deployStorage.json

‎src/Saas.Identity/Saas.IdentityProvider/deployment/run.sh

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@ fi
1515
# using volumes '--volume' to mount only the needed directories to the container.
1616
# using ':ro' to make scrip directories etc. read-only. Only config and log directories are writable.
1717
docker run \
18+
--platform linux/amd64 \
1819
--interactive \
1920
--tty \
2021
--rm \

‎src/Saas.Identity/Saas.IdentityProvider/deployment/script/config-b2c.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ for app in "${app_reg_array[@]}"; do
4646

4747
if [[ "${has_secret}" == true || "${has_secret}" == "true" ]]; then
4848
app_name=$(jq --raw-output '.name' <<<"${app}")
49-
secret_path=$(jq --raw-output '.secretPath' <<<"${app}")
49+
secret_path=$(jq --raw-output '.secretPath' <<< "${app}")
5050

5151
if [[ -s "${secret_path}" ]]; then
5252

‎src/Saas.Identity/Saas.IdentityProvider/deployment/script/init.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ function check-prerequisites() {
2020
--header "Checking prerequisites"
2121

2222
what_os="$(get-os)" ||
23-
echo "Unsupported OS: ${what_os}. This script support linux and macos." |
23+
echo "Unsupported OS: ${what_os}. This script support linux (WSL 2.0 on Windows) and MacOS." |
2424
log-output \
2525
--level error \
2626
--header "Critical Error" ||

‎src/Saas.Identity/Saas.IdentityProvider/readme.md

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ For more details please read the [FAQ](./faq.md):
2020

2121
Running the deployment script requires utilizing a container and Docker.
2222

23-
### Prerequisites
23+
### Prerequisites
2424

2525
The following platforms are supported:
2626

@@ -85,6 +85,8 @@ To run the script you must first setup of the deployment environment and build t
8585
./setup.sh
8686
```
8787

88+
> *Tip#1: On MacOS, you may need to run `chmod +x setup.sh` first, to make the script executable.*
89+
8890
![Screenshot of a Linux console window after initial setup.sh execution](.assets/readme/image-20230221115203497-1683889385776-2.png)
8991

9092
This will take a few minutes to complete and you will only need to do it once. The container will be named `asdk-script-deployment`.

‎src/Saas.Identity/Saas.Permissions/Saas.Permissions.Client/Saas.Permissions.Client.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFramework>net7.0</TargetFramework>
4+
<TargetFramework>net8.0</TargetFramework>
55
<ImplicitUsings>enable</ImplicitUsings>
66
<Nullable>enable</Nullable>
77
<Configurations>Debug;Release;Multi Debug</Configurations>

‎src/Saas.Identity/Saas.Permissions/Saas.Permissions.Service_v1.1/Saas.Permissions.Service.csproj

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk.Web">
22

33
<PropertyGroup>
4-
<TargetFramework>net7.0</TargetFramework>
4+
<TargetFramework>net8.0</TargetFramework>
55
<Nullable>enable</Nullable>
66
<ImplicitUsings>enable</ImplicitUsings>
77
<UserSecretsId>2f007af4-43b5-4316-903b-03340f0999e4</UserSecretsId>
@@ -16,11 +16,11 @@
1616
</ItemGroup>
1717

1818
<ItemGroup>
19-
<PackageReference Include="Microsoft.ApplicationInsights.AspNetCore" Version="2.21.0" />
20-
<PackageReference Include="Microsoft.EntityFrameworkCore" Version="7.0.13" />
21-
<PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="7.0.13" />
22-
<PackageReference Include="Microsoft.Extensions.Configuration.AzureAppConfiguration" Version="6.1.1" />
23-
<PackageReference Include="Microsoft.Extensions.Http.Polly" Version="7.0.13" />
19+
<PackageReference Include="Microsoft.ApplicationInsights.AspNetCore" Version="2.22.0" />
20+
<PackageReference Include="Microsoft.EntityFrameworkCore" Version="8.0.0" />
21+
<PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="8.0.0" />
22+
<PackageReference Include="Microsoft.Extensions.Configuration.AzureAppConfiguration" Version="7.0.0" />
23+
<PackageReference Include="Microsoft.Extensions.Http.Polly" Version="8.0.0" />
2424
</ItemGroup>
2525

2626
<ItemGroup>

‎src/Saas.Identity/Saas.Permissions/deployment/act/deploy.sh

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@ container_deployment_dir="/asdk/src/Saas.Identity/Saas.Permissions/deployment"
1717

1818
# running the './act/script/patch-app-name.sh' script using our ASDK deployment script container - i.e., not the act container
1919
docker run \
20+
--platform linux/amd64 \
2021
--interactive \
2122
--tty \
2223
--rm \

‎src/Saas.Identity/Saas.Permissions/deployment/act/workflows/permissions-api-deploy-debug.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,9 @@ permissions:
1010

1111
env:
1212
APP_NAME: permissions-api
13-
AZURE_WEBAPP_NAME: api-permission-asdk-test-83sx # set this to your application's name
13+
AZURE_WEBAPP_NAME: api-permission-asdk-test-v23y # set this to your application's name
1414
AZURE_WEBAPP_PACKAGE_PATH: "." # set this to the path to your web app project, defaults to the repository root
15-
DOTNET_VERSION: 7.x.x
15+
DOTNET_VERSION: 8.x.x
1616
PROJECT_DIR: ./src/Saas.Identity/Saas.Permissions/Saas.Permissions.Service_v1.1
1717
PROJECT_PATH: ${{ env.PROJECT_DIR }}/Saas.Permissions.Service.csproj
1818
PUBLISH_PATH: ./publish

‎src/Saas.Identity/Saas.Permissions/deployment/run.sh

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ container_deployment_dir="/asdk/src/Saas.Identity/Saas.Permissions/deployment"
1111
# using volumes '--volume' to mount only the needed directories to the container.
1212
# using ':ro' to make scrip directories etc. read-only. Only config and log directories are writable.
1313
docker run \
14+
--platform linux/amd64 \
1415
--interactive \
1516
--tty \
1617
--rm \

‎src/Saas.Lib/Act.Container/build.sh

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,3 +26,4 @@ else
2626
docker build --no-cache --file "${ACT_CONTAINER_DIR}/Dockerfile" --tag "${tag_name}" .
2727
fi
2828

29+
gh extension install https://github.com/nektos/gh-act

‎src/Saas.Lib/Deployment.Container/Dockerfile.AppleSilicon

Lines changed: 36 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,36 @@
1+
FROM --platform=linux/amd64 ubuntu:22.04
2+
3+
RUN apt-get update && apt-get install -y \
4+
curl \
5+
dnsutils \
6+
python3-pip \
7+
jq \
8+
sudo \
9+
libicu-dev \
10+
uuid-runtime \
11+
zip \
12+
dos2unix \
13+
python3-ruamel.yaml \
14+
&& curl -sL https://aka.ms/InstallAzureCLIDeb | sudo bash
15+
16+
# Install latest GitHub cli (gh)
17+
# https://github.com/cli/cli/blob/trunk/docs/install_linux.md
18+
RUN curl -fsSL https://cli.github.com/packages/githubcli-archive-keyring.gpg | sudo dd of=/usr/share/keyrings/githubcli-archive-keyring.gpg \
19+
&& sudo chmod go+r /usr/share/keyrings/githubcli-archive-keyring.gpg \
20+
&& echo "deb [arch=$(dpkg --print-architecture) signed-by=/usr/share/keyrings/githubcli-archive-keyring.gpg] https://cli.github.com/packages stable main" | sudo tee /etc/apt/sources.list.d/github-cli.list > /dev/null \
21+
&& sudo apt update \
22+
&& sudo apt install gh -y
23+
24+
RUN pip3 install PyYaml
25+
26+
# Install Azure Cli extension 'Storage-preview'
27+
# RUN az extension add --name storage-preview
28+
29+
WORKDIR /asdk
30+
31+
# Workaround for the dotnet 7 execution with rosetta2 emulation
32+
# https://github.com/Azure/bicep/issues/10245#issuecomment-1816816017
33+
ENV DOTNET_EnableWriteXorExecute=0
34+
35+
# trust repository in container
36+
RUN git config --global --add safe.directory /asdk

‎src/Saas.Lib/Deployment.Container/build.sh

Lines changed: 37 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,33 +1,58 @@
11
#!/usr/bin/env bash
22

3+
# shellcheck disable=SC1091
4+
source "./constants.sh"
5+
source "$SHARED_MODULE_DIR/util-module.sh"
6+
37
force_update=false
48

5-
while getopts f flag
6-
do
9+
while getopts f flag; do
710
case "${flag}" in
8-
f) force_update=true;;
9-
*) force_update=false;;
11+
f) force_update=true ;;
12+
*) force_update=false ;;
1013
esac
1114
done
1215

13-
repo_base="$( git rev-parse --show-toplevel )"
16+
repo_base="$(git rev-parse --show-toplevel)"
1417
docker_file_folder="${repo_base}/src/Saas.Lib/Deployment.Container"
1518

16-
architecture="$( uname -a )"
19+
architecture="$(uname -a)"
20+
21+
what_os="$(get-os)" ||
22+
echo "Unsupported OS: ${what_os}. This script support linux (ubxl.WSL 2.0 on Windows) and MacOS." |
23+
log-output \
24+
--level error \
25+
--header "Critical Error" ||
26+
exit 1
1727

18-
if [[ "${force_update}" == false ]]; then
28+
if [[ "${force_update}" == false ]]; then
1929
if [[ "${architecture}" == *"ARM64"* ]]; then
20-
echo "Building for ARM64 (including Apple Sillicon)..."
21-
docker build --file "${docker_file_folder}/Dockerfile.ARM" --tag asdk-script-deployment:latest .
30+
if [[ "${what_os}" == "linux" ]]; then
31+
echo "Building for Linux on Arm)..."
32+
docker build --file "${docker_file_folder}/Dockerfile.ARM" --tag asdk-script-deployment:latest .
33+
elif [[ "${what_os}" == "macos" ]]; then
34+
echo "Building for MacOS on Apple Silicon"
35+
docker build --file "${docker_file_folder}/Dockerfile.AppleSilicon" --tag asdk-script-deployment:latest .
36+
else
37+
exit 1
38+
fi
2239
else
40+
echo "Building for Linux (incl. WSL 2.0 on Windows) on x86_64)..."
2341
docker build --file "${docker_file_folder}/Dockerfile" --tag asdk-script-deployment:latest .
2442
fi
2543
else
2644
if [[ "${architecture}" == *"ARM64"* ]]; then
27-
echo "Building for ARM64 (including Apple Sillicon)..."
28-
docker build --no-cache --file "${docker_file_folder}/Dockerfile.ARM" --tag asdk-script-deployment:latest .
45+
if [[ "${what_os}" == "linux" ]]; then
46+
echo "Force building for Linux on Arm)..."
47+
docker build --no-cache --file "${docker_file_folder}/Dockerfile.ARM" --tag asdk-script-deployment:latest .
48+
elif [[ "${what_os}" == "macos" ]]; then
49+
echo "Force building for MacOS on Apple Silicon"
50+
docker build --no-cache --file "${docker_file_folder}/Dockerfile.AppleSilicon" --tag asdk-script-deployment:latest .
51+
else
52+
exit 1
53+
fi
2954
else
55+
echo "Force building for Linux (incl. WSL 2.0 on Windows) on x86_64)..."
3056
docker build --no-cache --file "${docker_file_folder}/Dockerfile" --tag asdk-script-deployment:latest .
3157
fi
3258
fi
33-

0 commit comments

Comments
 (0)