touch ups

Signed-off-by: Luke Roy <[email protected]>

Author: Luke-Roy-IBM

fotobox/README.md

@@ -1,5 +1,34 @@
 # IBM Fotobox
 
+This is the IBM Fotobox. Deploy your own Fotobox straight to the IBM Cloud Access it directly from any device with browser and camera. Take Pictures and view them all from your device. 
+
+The solution is based on:
+- The frontend a Svelte Single Page Application running as a App on Code Engine able to scale to 0 in oder to optimise cost.
+- The Upload function which generates a thumbnail of the image and stores both in COS written in Python and running as a Function on Code Engine.
+- The Downloader a Go programm designed to serve the images stored in COS or download all at one go if you are the operator of the fotobox.
+- All Images are stored in IBM Cloud Object Storage to ensure security and scalability. 
+
+## Setup
+
+If you use your own machine you'll need to install the following (if not
+already installed) and make sure you have a IBM Cloud Account:
+
+- [IBM Cloud command line (`ibmcloud`)](https://cloud.ibm.com/docs/cli/reference/ibmcloud?topic=cloud-cli-getting-started)
+- [Code Engine plugin (`ce`)](https://cloud.ibm.com/codeengine/cli)
+- [Terraform ](https://developer.hashicorp.com/terraform/install)
+- [jq](https://jqlang.org/)
+
+
+## Automated Setup
+
+In order to make the setup as convinent as possible we probide you with a setupscript which uses teraform and the IBM Cloud CLI
+
+1. configure the `terraform.auto.tfvars` with your apikey and your resource group id 
+
+2. Run the `setup.sh <apikey>`and it will deploy all the required components and done
+
+## Manual setup
+
 1. Setup COS with cos bucket this can be done over the UI or using the CLI  
     note dont the bucket name and API credentials
 

fotobox/cos-setup/main.tf

@@ -1,6 +1,6 @@
 # create a cos instance
 resource "ibm_resource_instance" "cos_instance" {
-  name = "cos-instance"
+  name = "cos-fotobox-instance"
   resource_group_id = var.resource_group
   plan = "standard"
   service = "cloud-object-storage"
@@ -45,16 +45,16 @@ resource "ibm_code_engine_secret" "fotobox-secret" {
   }
 }
 
-resource "ibm_code_engine_secret" "registry_secret" {
-  project_id = ibm_code_engine_project.ce-fotobox-project.id
-  name       = "container-registry-secret"
-  format = "registry"
-  data = {
-    "username" = "iamapikey" # Use 'iamapikey' as username for IBM Cloud
-    "password" = var.icr_secret
-    "server"   = "us.icr.io" # Change if using a different registry
-  }
-}
+#resource "ibm_code_engine_secret" "registry_secret" {
+#  project_id = ibm_code_engine_project.ce-fotobox-project.id
+#  name       = "container-registry-secret"
+#  format = "registry"
+#  data = {
+#    "username" = "iamapikey" # Use 'iamapikey' as username for IBM Cloud
+#    "password" = var.icr_secret
+#    "server"   = "us.icr.io" # Change if using a different registry
+#  }
+#}
 
 # create config map in project
 
@@ -63,9 +63,9 @@ resource "ibm_code_engine_config_map" "fotobox-config" {
   project_id = ibm_code_engine_project.ce-fotobox-project.id
   data = {
     "bucket" = ibm_cos_bucket.cos_bucket.bucket_name
-    "endpointURL" = ibm_cos_bucket.cos_bucket.s3_endpoint_private
+    "endpointURL" = ibm_cos_bucket.cos_bucket.s3_endpoint_public
     "imageprefix" = "my-event-"
-    "password" = "5e884898da28047151d0e56f8dc6292773603d0d6aabbdd62a11ef721d1542d8"
+    "passwords" = "5e884898da28047151d0e56f8dc6292773603d0d6aabbdd62a11ef721d1542d8"
     "region" = ibm_cos_bucket.cos_bucket.region_location
     "resource_instance_id" = local.resource_credentials.resource_instance_id
   }

fotobox/setup.sh

@@ -1,8 +1,17 @@
 #!/bin/bash
 
+pushd cos-setup
+
+terraform init
+
+terraform apply && sleep 10
+
+popd
+
 echo "create upload-function and download-application in code engine"
 
-ibmcloud target -g Default
+ibmcloud login --apikey $1
+ibmcloud target -g $(ibmcloud resource groups --default --output JSON | jq -r '.[0].id')
 
 ibmcloud ce project select -n codeengine-fotobox-project # name of the project that was setup in terraform script