From 50f7d898b7697e864130ea04c303ca38b5751c50 Mon Sep 17 00:00:00 2001 From: Matthew Fisher Date: Thu, 10 Nov 2022 08:55:47 -0800 Subject: [PATCH] use mcr.microsoft.com/azure-cli as base image Signed-off-by: Matthew Fisher --- Dockerfile | 4 ++-- action.yml | 3 --- entrypoint.sh | 3 --- 3 files changed, 2 insertions(+), 8 deletions(-) diff --git a/Dockerfile b/Dockerfile index b966b52..576fff2 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM python:3.10 +FROM mcr.microsoft.com/azure-cli LABEL "com.github.actions.name"="azure-blob-storage-upload" LABEL "com.github.actions.description"="Uploads assets to Azure Blob Storage" @@ -6,7 +6,7 @@ LABEL "com.github.actions.icon"="box" LABEL "com.github.actions.color"="green" LABEL "repository"="https://github.com/bacongobbler/azure-blob-storage-upload" LABEL "homepage"="https://github.com/bacongobbler/azure-blob-storage-upload" -LABEL "maintainer"="Matthew Fisher " +LABEL "maintainer"="Matthew Fisher " ADD entrypoint.sh /entrypoint.sh RUN chmod +x entrypoint.sh diff --git a/action.yml b/action.yml index a3019a3..f4bc6d3 100644 --- a/action.yml +++ b/action.yml @@ -5,9 +5,6 @@ branding: icon: "box" color: "green" inputs: - cli_version: - description: "If set, specifies the version of the Azure CLI to install. Defaults to latest" - required: false connection_string: description: "The connection string for the storage account. Used if value is set. Either connection_string or sas_token must be supplied" required: false diff --git a/entrypoint.sh b/entrypoint.sh index 5b30200..eaf1bce 100644 --- a/entrypoint.sh +++ b/entrypoint.sh @@ -50,7 +50,4 @@ if [[ -n ${INPUT_CLI_VERSION} ]]; then CLI_VERSION="==${INPUT_CLI_VERSION}" fi -# install the azure cli -pip install azure-cli${CLI_VERSION} - az storage blob ${VERB} ${CONNECTION_METHOD} --source ${INPUT_SOURCE_DIR} ${CONTAINER_NAME_FLAG} ${INPUT_CONTAINER_NAME} ${ARG_OVERWRITE} ${EXTRA_ARGS}