diff --git a/.devcontainer/Dockerfile b/.devcontainer/Dockerfile index 2751d6c30f..aa42c1ad25 100644 --- a/.devcontainer/Dockerfile +++ b/.devcontainer/Dockerfile @@ -1,6 +1,6 @@ -ARG VARIANT=bullseye -FROM --platform=amd64 mcr.microsoft.com/vscode/devcontainers/base:0-${VARIANT} +ARG IMAGE=bullseye +FROM --platform=amd64 mcr.microsoft.com/devcontainers/${IMAGE} RUN export DEBIAN_FRONTEND=noninteractive \ && apt-get update && apt-get install -y xdg-utils \ && apt-get clean -y && rm -rf /var/lib/apt/lists/* -RUN curl -fsSL https://aka.ms/install-azd.sh | bash +RUN curl -fsSL https://aka.ms/install-azd.sh | bash \ No newline at end of file diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json index 26d788f0f7..c7babc37f4 100644 --- a/.devcontainer/devcontainer.json +++ b/.devcontainer/devcontainer.json @@ -3,7 +3,7 @@ "build": { "dockerfile": "Dockerfile", "args": { - "VARIANT": "bullseye" + "IMAGE": "python:3.10" } }, "features": { diff --git a/.gitattributes b/.gitattributes new file mode 100644 index 0000000000..314766e91b --- /dev/null +++ b/.gitattributes @@ -0,0 +1,3 @@ +* text=auto eol=lf +*.{cmd,[cC][mM][dD]} text eol=crlf +*.{bat,[bB][aA][tT]} text eol=crlf diff --git a/README_azd.md b/README_azd.md index 52d03e3df0..5d9fda5b9d 100644 --- a/README_azd.md +++ b/README_azd.md @@ -26,7 +26,8 @@ Otherwise, you need to install them locally. If you don't have any pre-existing Azure services (i.e. OpenAI or Cognitive Search service), then you can provision all resources from scratch by following these steps: -1. Run `azd up` - This will provision Azure resources and deploy this sample to those resources, including building the search index based on the files found in the `./data` folder. +1. Run `azd auth login` to login to your Azure account. +1. Run `azd up` to provision Azure resources and deploy this sample to those resources. This also runs a script to build the search index based on files in the `./data` folder. 1. After the application has been successfully deployed you will see a URL printed to the console. Click that URL to interact with the application in your browser. > NOTE: It may take a minute for the application to be fully deployed. If you see a "Python Developer" welcome screen, then wait a minute and refresh the page. @@ -46,8 +47,8 @@ Run the following commands based on what you want to customize: * `azd env set AZURE_FORMRECOGNIZER_SERVICE_RESOURCE_GROUP {Name of existing resource group that Form Recognizer service is provisioned to}`. * `azd env set AZURE_FORMRECOGNIZER_SKU_NAME {Name of Form Recognizer SKU}`. Defaults to 'S0'. - -1. Run `azd up`. This will provision any missing Azure resources and deploy this sample to those resources, including building the search index based on the files found in the `./data` folder. +1. Run `azd auth login` to login to your Azure account. +1. Run `azd up` to provision Azure resources and deploy this sample to those resources. This also runs a script to build the search index based on files in the `./data` folder. 1. After the application has been successfully deployed you will see a URL printed to the console. Click that URL to interact with the application in your browser. > NOTE: It may take a minute for the application to be fully deployed. If you see a "Python Developer" welcome screen, then wait a minute and refresh the page.