Merge pull request #168 from junior/mushop_basic_license_header_fix

Mushop basic new version
oracle-quickstart · Jun 4, 2020 · 2072a20 · 2072a20
2 parents 942b79e + 315a06e
commit 2072a20
Show file tree

Hide file tree

Showing 10 changed files with 24 additions and 5 deletions.
diff --git a/deploy/basic/Dockerfile b/deploy/basic/Dockerfile
@@ -99,7 +99,7 @@ RUN rm -rf node_modules products hero *.md
 ###############################
 
 # ##### Go Builder image
-FROM golang:1.13 AS catalogue-builder
+FROM golang:1.14 AS catalogue-builder
 WORKDIR /go/src/mushop/catalogue
 
 # # Catalogue Go Source

diff --git a/deploy/basic/VERSION b/deploy/basic/VERSION
@@ -0,0 +1 @@
+1.1.1
diff --git a/deploy/basic/terraform/atp.tf b/deploy/basic/terraform/atp.tf
@@ -9,7 +9,7 @@ resource "oci_database_autonomous_database" "mushop_autonomous_database" {
   compartment_id           = var.compartment_ocid
   cpu_core_count           = 1
   data_storage_size_in_tbs = 1
-  db_name                  = "${var.database_name}${random_id.mushop_id.dec}"
+  db_name                  = var.database_name
   freeform_tags            = local.common_tags
   is_free_tier             = true
 

diff --git a/deploy/basic/terraform/loadbalancer.tf b/deploy/basic/terraform/loadbalancer.tf
@@ -1,3 +1,7 @@
+# Copyright (c) 2019 Oracle and/or its affiliates. All rights reserved.
+# Licensed under the Universal Permissive License v 1.0 as shown at http://oss.oracle.com/licenses/upl.
+# 
+
 resource "oci_load_balancer_load_balancer" "mushop_lb" {
 
   compartment_id = var.compartment_ocid

diff --git a/deploy/basic/terraform/main.tf b/deploy/basic/terraform/main.tf
@@ -1,6 +1,7 @@
 # Copyright (c) 2019 Oracle and/or its affiliates. All rights reserved.
 # Licensed under the Universal Permissive License v 1.0 as shown at http://oss.oracle.com/licenses/upl.
 # 
+
 terraform {
   required_version = ">= 0.12.0"
 }

diff --git a/deploy/basic/terraform/network.tf b/deploy/basic/terraform/network.tf
@@ -1,6 +1,7 @@
 # Copyright (c) 2019 Oracle and/or its affiliates. All rights reserved.
 # Licensed under the Universal Permissive License v 1.0 as shown at http://oss.oracle.com/licenses/upl.
 # 
+
 resource "oci_core_virtual_network" "mushopVCN" {
   cidr_block     = "10.1.0.0/16"
   compartment_id = var.compartment_ocid

diff --git a/deploy/basic/terraform/provider.tf b/deploy/basic/terraform/provider.tf
@@ -1,6 +1,7 @@
 # Copyright (c) 2019 Oracle and/or its affiliates. All rights reserved.
 # Licensed under the Universal Permissive License v 1.0 as shown at http://oss.oracle.com/licenses/upl.
 # 
+
 provider "oci" {
   tenancy_ocid     = var.tenancy_ocid
   # user_ocid        = "${var.user_ocid}"

diff --git a/deploy/basic/terraform/schema.yaml b/deploy/basic/terraform/schema.yaml
@@ -1,3 +1,7 @@
+# Copyright (c) 2019 Oracle and/or its affiliates. All rights reserved.
+# Licensed under the Universal Permissive License v 1.0 as shown at http://oss.oracle.com/licenses/upl.
+# 
+
 title: "Three-tier web application using Always Free resources"
 description: "A demo eCommerce example app using Always Free Oracle Cloud Infrastructure"
 schemaVersion: 1.1.0
@@ -44,14 +48,19 @@ variables:
     required: true
     title: "Database Name"
     description: "The name for the Autonomous Database instance"
-    default: "mushop"
+    default: "MuShopDB"
+    minLength: 1
+    maxLength: 14
+    pattern: "^[a-zA-Z][a-zA-Z0-9]+$"
 
   ssh_public_key:
-    type: string
+    type: oci:core:ssh:publickey
     required: false
     title: "SSH Public Key"
     description: "The public SSH key for the key-pair that you want to use, if you wish to login to the instances over SSH"
-
+    additionalProps:
+      allowMultiple: true
+    pattern: "((^(ssh-rsa AAAAB3NzaC1yc2|ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNT|ecdsa-sha2-nistp384 AAAAE2VjZHNhLXNoYTItbmlzdHAzODQAAAAIbmlzdHAzOD|ecdsa-sha2-nistp521 AAAAE2VjZHNhLXNoYTItbmlzdHA1MjEAAAAIbmlzdHA1Mj|ssh-ed25519 AAAAC3NzaC1lZDI1NTE5|ssh-dss AAAAB3NzaC1kc3)[0-9A-Za-z+\/]+[=]{0,3})( [^,]*)?)(,((ssh-rsa AAAAB3NzaC1yc2|ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNT|ecdsa-sha2-nistp384 AAAAE2VjZHNhLXNoYTItbmlzdHAzODQAAAAIbmlzdHAzOD|ecdsa-sha2-nistp521 AAAAE2VjZHNhLXNoYTItbmlzdHA1MjEAAAAIbmlzdHA1Mj|ssh-ed25519 AAAAC3NzaC1lZDI1NTE5|ssh-dss AAAAB3NzaC1kc3)[0-9A-Za-z+\/]+[=]{0,3})( [^,]*)?)*$"
 
 outputGroups:
   - title: "MuShop App details"

diff --git a/deploy/basic/terraform/storage.tf b/deploy/basic/terraform/storage.tf
@@ -1,6 +1,7 @@
 # Copyright (c) 2019 Oracle and/or its affiliates. All rights reserved.
 # Licensed under the Universal Permissive License v 1.0 as shown at http://oss.oracle.com/licenses/upl.
 # 
+
 resource "oci_objectstorage_bucket" "mushop" {
 
   #Required

diff --git a/deploy/basic/terraform/variables.tf b/deploy/basic/terraform/variables.tf
@@ -1,6 +1,7 @@
 # Copyright (c) 2019 Oracle and/or its affiliates. All rights reserved.
 # Licensed under the Universal Permissive License v 1.0 as shown at http://oss.oracle.com/licenses/upl.
 # 
+
 variable "tenancy_ocid" {}
 variable "region" {}