Merge pull request #3 from beauraines/aws

Modifications to use AWS

Dockerfile

@@ -5,10 +5,17 @@ COPY processDashboard.sh .
 COPY upload.R .
 
 FROM dashboard
-ARG AZURE_STORAGE_ACCOUNT
-ARG AZURE_STORAGE_KEY
-ENV AZURE_STORAGE_ACCOUNT=${AZURE_STORAGE_ACCOUNT}
-ENV AZURE_STORAGE_KEY=${AZURE_STORAGE_KEY}
+
+ARG AWS_KEY
+ARG AWS_SECRET
+ARG AWS_REGION
+ARG AWS_BUCKET
+
+ENV AWS_KEY=${AWS_KEY}
+ENV AWS_SECRET=${AWS_SECRET}
+ENV AWS_REGION=${AWS_REGION}
+ENV AWS_BUCKET=${AWS_BUCKET}
+
 CMD /bin/bash processDashboard.sh
 
 

README.md

@@ -7,12 +7,14 @@ Covid Metrics Dashboard in R
 ## The Container
 
 ```sh
-AZURE_STORAGE_ACCOUNT=<your storage account>
-AZURE_STORAGE_KEY=<your storage key>
+AWS_KEY=< your AWS_KEY > 
+AWS_SECRET=< your AWS_SECRET >
+AWS_REGION=<your AWS_REGION >
+AWS_BUCKET=<your AWS_BUCKET >
 IMAGE_NAME=<your image name>
-docker build --pull --rm -f "Dockerfile" -t ${IMAGE_NAME} --build-arg AZURE_STORAGE_ACCOUNT=${AZURE_STORAGE_ACCOUNT} --build-arg AZURE_STORAGE_KEY=${AZURE_STORAGE_KEY} .
+docker build --pull --rm -f "Dockerfile" -t ${IMAGE_NAME} --build-arg AWS_KEY=${AWS_KEY} --build-arg AWS_SECRET=${AWS_SECRET} --build-arg AWS_REGION=${AWS_REGION} --build-arg AWS_BUCKET=${AWS_BUCKET} .
 ```
 
-The container can then be pushed to an Azure Container Registry and with an Azure Container Registry Task, scheduled to run at a specific time.
+The container can then be pushed to an AWS ECR and scheduled to run at a specific time, with Event Bridge.
 
 

processDashboard.sh

@@ -5,4 +5,5 @@ wget https://raw.githubusercontent.com/beauraines/covid-r/main/CovidDashboard.Rm
 wget https://raw.githubusercontent.com/beauraines/covid-r/main/CumulativeDeathsAndCases.R
 
 Rscript -e "rmarkdown::render('CovidDashboard.Rmd')"
-Rscript upload.R $AZURE_STORAGE_ACCOUNT $AZURE_STORAGE_KEY CovidDashboard.html
+Rscript upload.R $AWS_KEY $AWS_SECRET $AWS_REGION $AWS_BUCKET
+

upload.R

@@ -1,13 +1,30 @@
-library(AzureStor)
-options(azure_storage_progress_bar=TRUE)
-print("Uploading to azure")
+library(aws.s3)
 args = commandArgs(trailingOnly=TRUE)
 if (length(args)==0) {
   stop("At least one argument must be supplied, the key", call.=FALSE)
 }
+print('uploading to AWS')
 
-cont <- blob_container(endpoint=paste("https://",args[1],".blob.core.windows.net/$web",sep=""),
-                       key=args[2])
-upload_blob(cont, args[3], dest=args[3])
-print("Uploaded to azure")
 
+key = args[1]
+secret = args[2] 
+region=args[3]
+bucket = args[4]
+
+put_object(
+  file = file.path(".", "CovidDashboard.html"), 
+  object = "CovidDashboard.html", 
+  bucket = bucket,
+  multipart = TRUE,
+  region = region,
+  key = key, 
+  secret = secret,
+  headers=c('content-type' = 'text/html')
+)
+
+get_bucket(bucket = bucket,key = key, secret = secret ,region = region)
+head_object(object='CovidDashboard.html', bucket = bucket,key = key, secret = secret ,region = region)
+)
+
+
+print('uploaded')