From 442bb4d3158adde8903e90eb157dbeada1597574 Mon Sep 17 00:00:00 2001
From: Administrator <mengkzhaoyun@gmail.com>
Date: Thu, 7 Nov 2019 15:19:10 +0800
Subject: [PATCH] Add oracle 12c

---
 README.md                     |  29 ++++++++---------------------
 oracle11g.docx => oracle.docx | Bin
 step.yaml                     |   8 ++++----
 values.yaml                   |   8 ++++----
 4 files changed, 16 insertions(+), 29 deletions(-)
 rename oracle11g.docx => oracle.docx (100%)

diff --git a/README.md b/README.md
index 31c58d8..19a31f0 100644
--- a/README.md
+++ b/README.md
@@ -1,30 +1,18 @@
 # oracle 11g xe
 
-Installation
-
-docker pull registry.ispacesys.cn/public/oracle-xe-11g
-Run with 8080 and 1521 ports opened:
-
-docker run -d -p 8080:8080 -p 1521:1521 registry.ispacesys.cn/public/oracle-xe-11g
-Run with data on host and reuse it:
-
-docker run -d -p 8080:8080 -p 1521:1521 -v /my/oracle/data:/u01/app/oracle registry.ispacesys.cn/public/oracle-xe-11g
-Run with customization of processes, sessions, transactions This customization is needed on the database initialization stage. If you are using mounted folder with DB files this is not used:
-
-##Consider this formula before customizing:
-#processes=x
-#sessions=x*1.1+5
-#transactions=sessions*1.1
-
+# 使用 docker运行方式，初始化 processes sessions transactions
 docker run -d -p 8080:8080 -p 1521:1521 -v /my/oracle/data:/u01/app/oracle\
 -e processes=1000 \
 -e sessions=1105 \
 -e transactions=1215 \
-registry.ispacesys.cn/public/oracle-xe-11g
+registry-vpc.cn-qingdao.aliyuncs.com/wod/oracle:11g
 Run with custom sys password:
 
-docker run -d -p 8080:8080 -p 1521:1521 -e DEFAULT_SYS_PASS=sYs-p@ssw0rd registry.ispacesys.cn/public/oracle-xe-11g
-Connect database with following setting:
+# 设置密码运行
+docker run -d -p 8080:8080 -p 1521:1521 -e DEFAULT_SYS_PASS=sYs-p@ssw0rd registry-vpc.cn-qingdao.aliyuncs.com/wod/oracle:11g
+
+
+# Oracle 连接方式
 
 hostname: localhost
 port: 1521
@@ -33,8 +21,7 @@ username: system
 password: oracle
 Password for SYS & SYSTEM:
 
-oracle
-Connect to Oracle Application Express web management console with following settings:
+# Oracle 终端管理页面
 
 http://localhost:8080/apex
 workspace: INTERNAL
diff --git a/oracle11g.docx b/oracle.docx
similarity index 100%
rename from oracle11g.docx
rename to oracle.docx
diff --git a/step.yaml b/step.yaml
index 097904c..df3e0e4 100644
--- a/step.yaml
+++ b/step.yaml
@@ -2,19 +2,19 @@ configInfo:
   - name: image
     text: 镜像
     type: text
-    value: "registry.ispacesys.cn/public/oracle-xe-11g"
+    value: "registry-vpc.cn-qingdao.aliyuncs.com/wod/oracle"
   - name: tag
     text: 版本
     type: radio
-    value: ["latest"]
+    value: ["11g","12c"]
   - name: nodeSelector.hostname
     text: 服务器地址
     type: text
-    value: "172.16.1.23"
+    value: "172.16.1.26"
   - name: storageSpec
     text: 存储类
     type: storage
-    value: "rook-ceph-block"
+    value: "nfs-client"
     storage: "4Gi"
   - name: resources
     text: 资源限制
diff --git a/values.yaml b/values.yaml
index 516855a..c3427b8 100644
--- a/values.yaml
+++ b/values.yaml
@@ -1,7 +1,7 @@
-image: "registry.ispacesys.cn/public/oracle-xe-11g"
-tag: "latest"
+image: "registry-vpc.cn-qingdao.aliyuncs.com/wod/oracle"
+tag: "11g"
 nodeSelector: 
-  hostname: 172.16.1.23
+  hostname: 172.16.1.26
 storageSpec:
   volumeClaimTemplate:
     spec:
@@ -9,7 +9,7 @@ storageSpec:
       accessModes: ["ReadWriteOnce"]
       resources:
         requests:
-          storage: 1Gi
+          storage: 10Gi
     selector: {}
 
 busybox:
-- 
2.26.0