Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #253 from 1iveowl/main
Upgrading to .NET 8 - adding Apple Silicon Fixes and dependency fixes
- Loading branch information
Showing
35 changed files
with
151 additions
and
65 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
10 changes: 5 additions & 5 deletions
10
src/Saas.Application/Saas.Application.Web/Saas.Application.Web.csproj
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
1 change: 1 addition & 0 deletions
1
src/Saas.Identity/Saas.IdentityProvider/deployment/bicep/.gitignore
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1 @@ | ||
| deployStorage.json |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
2 changes: 1 addition & 1 deletion
2
src/Saas.Identity/Saas.Permissions/Saas.Permissions.Client/Saas.Permissions.Client.csproj
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,36 @@ | ||
| FROM --platform=linux/amd64 ubuntu:22.04 | ||
|
|
||
| RUN apt-get update && apt-get install -y \ | ||
| curl \ | ||
| dnsutils \ | ||
| python3-pip \ | ||
| jq \ | ||
| sudo \ | ||
| libicu-dev \ | ||
| uuid-runtime \ | ||
| zip \ | ||
| dos2unix \ | ||
| python3-ruamel.yaml \ | ||
| && curl -sL https://aka.ms/InstallAzureCLIDeb | sudo bash | ||
|
|
||
| # Install latest GitHub cli (gh) | ||
| # https://github.com/cli/cli/blob/trunk/docs/install_linux.md | ||
| RUN curl -fsSL https://cli.github.com/packages/githubcli-archive-keyring.gpg | sudo dd of=/usr/share/keyrings/githubcli-archive-keyring.gpg \ | ||
| && sudo chmod go+r /usr/share/keyrings/githubcli-archive-keyring.gpg \ | ||
| && 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 \ | ||
| && sudo apt update \ | ||
| && sudo apt install gh -y | ||
|
|
||
| RUN pip3 install PyYaml | ||
|
|
||
| # Install Azure Cli extension 'Storage-preview' | ||
| # RUN az extension add --name storage-preview | ||
|
|
||
| WORKDIR /asdk | ||
|
|
||
| # Workaround for the dotnet 7 execution with rosetta2 emulation | ||
| # https://github.com/Azure/bicep/issues/10245#issuecomment-1816816017 | ||
| ENV DOTNET_EnableWriteXorExecute=0 | ||
|
|
||
| # trust repository in container | ||
| RUN git config --global --add safe.directory /asdk |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,33 +1,58 @@ | ||
| #!/usr/bin/env bash | ||
|
|
||
| # shellcheck disable=SC1091 | ||
| source "./constants.sh" | ||
| source "$SHARED_MODULE_DIR/util-module.sh" | ||
|
|
||
| force_update=false | ||
|
|
||
| while getopts f flag | ||
| do | ||
| while getopts f flag; do | ||
| case "${flag}" in | ||
| f) force_update=true;; | ||
| *) force_update=false;; | ||
| f) force_update=true ;; | ||
| *) force_update=false ;; | ||
| esac | ||
| done | ||
|
|
||
| repo_base="$( git rev-parse --show-toplevel )" | ||
| repo_base="$(git rev-parse --show-toplevel)" | ||
| docker_file_folder="${repo_base}/src/Saas.Lib/Deployment.Container" | ||
|
|
||
| architecture="$( uname -a )" | ||
| architecture="$(uname -a)" | ||
|
|
||
| what_os="$(get-os)" || | ||
| echo "Unsupported OS: ${what_os}. This script support linux (ubxl.WSL 2.0 on Windows) and MacOS." | | ||
| log-output \ | ||
| --level error \ | ||
| --header "Critical Error" || | ||
| exit 1 | ||
|
|
||
| if [[ "${force_update}" == false ]]; then | ||
| if [[ "${force_update}" == false ]]; then | ||
| if [[ "${architecture}" == *"ARM64"* ]]; then | ||
| echo "Building for ARM64 (including Apple Sillicon)..." | ||
| docker build --file "${docker_file_folder}/Dockerfile.ARM" --tag asdk-script-deployment:latest . | ||
| if [[ "${what_os}" == "linux" ]]; then | ||
| echo "Building for Linux on Arm)..." | ||
| docker build --file "${docker_file_folder}/Dockerfile.ARM" --tag asdk-script-deployment:latest . | ||
| elif [[ "${what_os}" == "macos" ]]; then | ||
| echo "Building for MacOS on Apple Silicon" | ||
| docker build --file "${docker_file_folder}/Dockerfile.AppleSilicon" --tag asdk-script-deployment:latest . | ||
| else | ||
| exit 1 | ||
| fi | ||
| else | ||
| echo "Building for Linux (incl. WSL 2.0 on Windows) on x86_64)..." | ||
| docker build --file "${docker_file_folder}/Dockerfile" --tag asdk-script-deployment:latest . | ||
| fi | ||
| else | ||
| if [[ "${architecture}" == *"ARM64"* ]]; then | ||
| echo "Building for ARM64 (including Apple Sillicon)..." | ||
| docker build --no-cache --file "${docker_file_folder}/Dockerfile.ARM" --tag asdk-script-deployment:latest . | ||
| if [[ "${what_os}" == "linux" ]]; then | ||
| echo "Force building for Linux on Arm)..." | ||
| docker build --no-cache --file "${docker_file_folder}/Dockerfile.ARM" --tag asdk-script-deployment:latest . | ||
| elif [[ "${what_os}" == "macos" ]]; then | ||
| echo "Force building for MacOS on Apple Silicon" | ||
| docker build --no-cache --file "${docker_file_folder}/Dockerfile.AppleSilicon" --tag asdk-script-deployment:latest . | ||
| else | ||
| exit 1 | ||
| fi | ||
| else | ||
| echo "Force building for Linux (incl. WSL 2.0 on Windows) on x86_64)..." | ||
| docker build --no-cache --file "${docker_file_folder}/Dockerfile" --tag asdk-script-deployment:latest . | ||
| fi | ||
| fi | ||
|
|
Oops, something went wrong.