From e20cb1db05cd2497123e6caf1ba201499312911a Mon Sep 17 00:00:00 2001
From: qiaofeng1227 <76487013@qq.com>
Date: Mon, 25 Jul 2022 13:55:10 +0800
Subject: [PATCH] Update pre.yml

---
 apps/roles/oracle/tasks/pre.yml | 23 ++++++-----------------
 1 file changed, 6 insertions(+), 17 deletions(-)

diff --git a/apps/roles/oracle/tasks/pre.yml b/apps/roles/oracle/tasks/pre.yml
index b82504c5..f98c3a3b 100644
--- a/apps/roles/oracle/tasks/pre.yml
+++ b/apps/roles/oracle/tasks/pre.yml
@@ -19,8 +19,8 @@
   - pause:
       prompt: |
         Choice Oracle version: 
-        0: Oracle 21.3.0
-        1: Oracle 18.4.0
+        0: Oracle 21
+        1: Oracle 18
         private: no
         Default:0
     register: oracle_version_options
@@ -48,9 +48,9 @@
   - pause:
       prompt: |
         Choice Oracle version: 
-        0: Oracle 21.3.0.0
-        1: Oracle 19.3.0.0
-        2: Oracle 12.2.0.1
+        0: Oracle 21
+        1: Oracle 19
+        2: Oracle 12
         private: no
         Default:0
     register: oracle_version_options
@@ -72,16 +72,5 @@
       sed -i 's/APP_VERSION=.*/APP_VERSION={{oracle_version}}/g' {{installpath}}/{{appname}}/.env
       yq eval 'del(.services.oracle.profiles)' docker-compose.yml > tmp.yml
       cat tmp.yml > docker-compose.yml
-      rm -f tmp.yml 
-      
-  - name: Copy login.exp file
-    copy:
-      src: login.exp
-      dest: /tmp/login.exp
-      
-  - name: Pull the image of enterprise
-    shell: |
-      expect /tmp/login.exp
-      docker pull container-registry.oracle.com/database/enterprise:"{{oracle_version}}"
-      rm -f /tmp/login.exp
+      rm -f tmp.yml
   when: oracle_edition == "enterprise"