From 200063f8a672a0488f2ce276f4cff0d9b10a2a23 Mon Sep 17 00:00:00 2001
From: Brady Neumann <bneumann@conserviscorp.com>
Date: Thu, 1 Dec 2016 13:28:27 -0600
Subject: [PATCH 01/42] Added support for storing data on the host machine to
 persist data beyond the life of the container.

---
 Dockerfile        |  3 +++
 README.md         |  5 +++++
 assets/startup.sh | 11 +++++++++++
 3 files changed, 19 insertions(+)

diff --git a/Dockerfile b/Dockerfile
index d9d88f9..21ec4b8 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -5,6 +5,9 @@ MAINTAINER Wei-Ming Wu <wnameless@gmail.com>
 ADD assets /assets
 RUN /assets/setup.sh
 
+RUN mv /u01/app/oracle/oradata /u01/app/oracle/oradata.orig
+VOLUME /u01/app/oracle/oradata
+
 EXPOSE 22
 EXPOSE 1521
 EXPOSE 8080
diff --git a/README.md b/README.md
index 86968de..21834e6 100644
--- a/README.md
+++ b/README.md
@@ -25,6 +25,11 @@ Run this, if you want the database to be connected remotely:
 docker run -d -p 49160:22 -p 49161:1521 -e ORACLE_ALLOW_REMOTE=true wnameless/oracle-xe-11g
 ```
 
+Run this to store data in a volume outside the docker container:
+```
+docker run -d -p 49160:22 -p 49161:1521 -v /my/data/folder:/u01/app/oracle/oradata wnameless/oracle-xe-11g
+```
+
 Connect database with following setting:
 ```
 hostname: localhost
diff --git a/assets/startup.sh b/assets/startup.sh
index f4d8ab6..67aed70 100644
--- a/assets/startup.sh
+++ b/assets/startup.sh
@@ -1,4 +1,15 @@
 #!/bin/bash
+
+# Initialize the host's data volume, leaving a trace when finished.
+if [ ! -e /u01/app/oracle/oradata/dataloaded ]
+then
+  cp -r /u01/app/oracle/oradata.orig/* /u01/app/oracle/oradata/
+  touch /u01/app/oracle/oradata/dataloaded
+  echo "Host data volume was initialized."
+else
+  echo "Data was loaded from the host."
+fi
+
 LISTENER_ORA=/u01/app/oracle/product/11.2.0/xe/network/admin/listener.ora
 TNSNAMES_ORA=/u01/app/oracle/product/11.2.0/xe/network/admin/tnsnames.ora
 

From c56529e975940f471824e77d44b6f90eb9ceded5 Mon Sep 17 00:00:00 2001
From: wleroux <wleroux@mxi.com>
Date: Fri, 2 Dec 2016 15:45:00 -0500
Subject: [PATCH 02/42] Fixed permission issue with oradata

A recent change has introduced volumes to docker-oracle-xe-11g that broke the initialization of the oracle instance.

This is due to a defect with the recursive copy of the original oradata: cp -r does not retain the original attributes of the files such as owner and group. When oracle initializes, it doesn't have permission to access the oradata. Instead of cp -r, cp -a does the same as cp -r but preserves the attributes. This effectively retains the permission settings of the original oradata.
---
 .gitattributes    | 1 +
 assets/startup.sh | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)
 create mode 100644 .gitattributes

diff --git a/.gitattributes b/.gitattributes
new file mode 100644
index 0000000..50ca329
--- /dev/null
+++ b/.gitattributes
@@ -0,0 +1 @@
+*.sh eol=lf
diff --git a/assets/startup.sh b/assets/startup.sh
index 67aed70..8e8efaf 100644
--- a/assets/startup.sh
+++ b/assets/startup.sh
@@ -3,7 +3,7 @@
 # Initialize the host's data volume, leaving a trace when finished.
 if [ ! -e /u01/app/oracle/oradata/dataloaded ]
 then
-  cp -r /u01/app/oracle/oradata.orig/* /u01/app/oracle/oradata/
+  cp -a /u01/app/oracle/oradata.orig/* /u01/app/oracle/oradata/
   touch /u01/app/oracle/oradata/dataloaded
   echo "Host data volume was initialized."
 else

From 152d88950697b5980da5d28b6d10ab53d05fe32e Mon Sep 17 00:00:00 2001
From: Brady Neumann <bneumann@conserviscorp.com>
Date: Mon, 5 Dec 2016 08:16:06 -0600
Subject: [PATCH 03/42] Revert "Added support for storing data on the host
 machine to persist data beyond the life of the container."

This reverts commit 200063f8a672a0488f2ce276f4cff0d9b10a2a23.
---
 Dockerfile        |  3 ---
 README.md         |  5 -----
 assets/startup.sh | 11 -----------
 3 files changed, 19 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 21ec4b8..d9d88f9 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -5,9 +5,6 @@ MAINTAINER Wei-Ming Wu <wnameless@gmail.com>
 ADD assets /assets
 RUN /assets/setup.sh
 
-RUN mv /u01/app/oracle/oradata /u01/app/oracle/oradata.orig
-VOLUME /u01/app/oracle/oradata
-
 EXPOSE 22
 EXPOSE 1521
 EXPOSE 8080
diff --git a/README.md b/README.md
index 21834e6..86968de 100644
--- a/README.md
+++ b/README.md
@@ -25,11 +25,6 @@ Run this, if you want the database to be connected remotely:
 docker run -d -p 49160:22 -p 49161:1521 -e ORACLE_ALLOW_REMOTE=true wnameless/oracle-xe-11g
 ```
 
-Run this to store data in a volume outside the docker container:
-```
-docker run -d -p 49160:22 -p 49161:1521 -v /my/data/folder:/u01/app/oracle/oradata wnameless/oracle-xe-11g
-```
-
 Connect database with following setting:
 ```
 hostname: localhost
diff --git a/assets/startup.sh b/assets/startup.sh
index 8e8efaf..f4d8ab6 100644
--- a/assets/startup.sh
+++ b/assets/startup.sh
@@ -1,15 +1,4 @@
 #!/bin/bash
-
-# Initialize the host's data volume, leaving a trace when finished.
-if [ ! -e /u01/app/oracle/oradata/dataloaded ]
-then
-  cp -a /u01/app/oracle/oradata.orig/* /u01/app/oracle/oradata/
-  touch /u01/app/oracle/oradata/dataloaded
-  echo "Host data volume was initialized."
-else
-  echo "Data was loaded from the host."
-fi
-
 LISTENER_ORA=/u01/app/oracle/product/11.2.0/xe/network/admin/listener.ora
 TNSNAMES_ORA=/u01/app/oracle/product/11.2.0/xe/network/admin/tnsnames.ora
 

From 37b9d9c9f33e419ba6a3f9ee025a36338dea7e9e Mon Sep 17 00:00:00 2001
From: Daniel Connolly <dan.connolly@outlook.com>
Date: Thu, 9 Feb 2017 21:47:42 +0100
Subject: [PATCH 04/42] run scripts in docker-entrypoint-initdb.d as SYSDBA

Using a script in docker-entrypoint-initdb.d to install DBMS_CRYPTO package causes errors because its not installed as SYSDBA. Wouldnt it be preferable to run these scripts as SYSDBA?
---
 assets/startup.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/assets/startup.sh b/assets/startup.sh
index f4d8ab6..fcf527f 100644
--- a/assets/startup.sh
+++ b/assets/startup.sh
@@ -22,7 +22,7 @@ fi
 for f in /docker-entrypoint-initdb.d/*; do
   case "$f" in
     *.sh)     echo "$0: running $f"; . "$f" ;;
-    *.sql)    echo "$0: running $f"; echo "exit" | /u01/app/oracle/product/11.2.0/xe/bin/sqlplus "SYSTEM/oracle" @"$f"; echo ;;
+    *.sql)    echo "$0: running $f"; echo "exit" | /u01/app/oracle/product/11.2.0/xe/bin/sqlplus "SYS/oracle" AS SYSDBA @"$f"; echo ;;
     *)        echo "$0: ignoring $f" ;;
   esac
   echo

From 2b866fe4fbb9a2ea35f5a469810b270b3e43a04a Mon Sep 17 00:00:00 2001
From: wmw <wnameless@gmail.com>
Date: Mon, 6 Mar 2017 10:42:52 +0800
Subject: [PATCH 05/42] Upgrade Ubuntu from 16.04 to 16.04.02

---
 Dockerfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Dockerfile b/Dockerfile
index d9d88f9..a72c3a3 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,4 +1,4 @@
-FROM ubuntu:16.04
+FROM ubuntu:16.04.02
 
 MAINTAINER Wei-Ming Wu <wnameless@gmail.com>
 

From b42b406b53ada125729f83a0fd0d8ece60b84641 Mon Sep 17 00:00:00 2001
From: wmw <wnameless@gmail.com>
Date: Mon, 6 Mar 2017 10:44:24 +0800
Subject: [PATCH 06/42] Update Dockerfile

---
 Dockerfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Dockerfile b/Dockerfile
index a72c3a3..e1f8793 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,4 +1,4 @@
-FROM ubuntu:16.04.02
+FROM ubuntu:16.04.2
 
 MAINTAINER Wei-Ming Wu <wnameless@gmail.com>
 

From 76c94f072cb8e22022513451928502611dad006a Mon Sep 17 00:00:00 2001
From: wmw <wnameless@gmail.com>
Date: Mon, 6 Mar 2017 15:36:19 +0800
Subject: [PATCH 07/42] Revert version

---
 Dockerfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Dockerfile b/Dockerfile
index e1f8793..d9d88f9 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,4 +1,4 @@
-FROM ubuntu:16.04.2
+FROM ubuntu:16.04
 
 MAINTAINER Wei-Ming Wu <wnameless@gmail.com>
 

From 35ce8fa7b4388b963eb174c0b0f2128d94f24fc2 Mon Sep 17 00:00:00 2001
From: wmw <wnameless@gmail.com>
Date: Thu, 4 May 2017 15:42:02 +0800
Subject: [PATCH 08/42] Update LICENSE

---
 LICENSE | 208 +++++++++++++++++++++++++++++++++++++++++++++++++++++---
 1 file changed, 198 insertions(+), 10 deletions(-)

diff --git a/LICENSE b/LICENSE
index f05ac35..2ec1bb8 100644
--- a/LICENSE
+++ b/LICENSE
@@ -1,13 +1,201 @@
-Copyright 2014 Wei-Ming Wu
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
 
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
 
-    http://www.apache.org/licenses/LICENSE-2.0
+   1. Definitions.
 
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+   APPENDIX: How to apply the Apache License to your work.
+
+      To apply the Apache License to your work, attach the following
+      boilerplate notice, with the fields enclosed by brackets "{}"
+      replaced with your own identifying information. (Don't include
+      the brackets!)  The text should be enclosed in the appropriate
+      comment syntax for the file format. We also recommend that a
+      file or class name and description of purpose be included on the
+      same "printed page" as the copyright notice for easier
+      identification within third-party archives.
+
+   Copyright 2014 Wei-Ming Wu
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.

From feadff2ee130ff704616db304fa7df1f07d29825 Mon Sep 17 00:00:00 2001
From: wmw <wnameless@gmail.com>
Date: Sat, 26 Aug 2017 09:39:59 +0800
Subject: [PATCH 09/42] Disable password verification by default. Move init
 scripts to /docker-entrypoint-initdb.d.bak after executed.

---
 assets/setup.sh   | 3 +++
 assets/startup.sh | 6 ++++++
 2 files changed, 9 insertions(+)

diff --git a/assets/setup.sh b/assets/setup.sh
index e7c5aab..551df1d 100755
--- a/assets/setup.sh
+++ b/assets/setup.sh
@@ -44,5 +44,8 @@ chmod +x /usr/sbin/startup.sh &&
 # Remove installation files
 rm -r /assets/
 
+# Create initialization script folders
+mkdir /docker-entrypoint-initdb.d
+mkdir /docker-entrypoint-initdb.d.bak
 
 exit $?
diff --git a/assets/startup.sh b/assets/startup.sh
index fcf527f..38fed70 100644
--- a/assets/startup.sh
+++ b/assets/startup.sh
@@ -15,6 +15,8 @@ export ORACLE_HOME=/u01/app/oracle/product/11.2.0/xe
 export PATH=$ORACLE_HOME/bin:$PATH
 export ORACLE_SID=XE
 
+echo "ALTER PROFILE DEFAULT LIMIT PASSWORD_VERIFY_FUNCTION NULL;" | sqlplus -s SYSTEM/oracle
+
 if [ "$ORACLE_ALLOW_REMOTE" = true ]; then
   echo "alter system disable restricted session;" | sqlplus -s SYSTEM/oracle
 fi
@@ -27,3 +29,7 @@ for f in /docker-entrypoint-initdb.d/*; do
   esac
   echo
 done
+
+if [ "$(ls -A /docker-entrypoint-initdb.d)" ]; then
+  mv /docker-entrypoint-initdb.d/* /docker-entrypoint-initdb.d.bak
+fi

From 3eff7b81cb792ec5ca31df5a466ba37f2c227e5c Mon Sep 17 00:00:00 2001
From: wmw <wnameless@gmail.com>
Date: Sat, 26 Aug 2017 09:44:47 +0800
Subject: [PATCH 10/42] Update README.md

---
 README.md | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/README.md b/README.md
index 86968de..b1a3fce 100644
--- a/README.md
+++ b/README.md
@@ -25,6 +25,11 @@ Run this, if you want the database to be connected remotely:
 docker run -d -p 49160:22 -p 49161:1521 -e ORACLE_ALLOW_REMOTE=true wnameless/oracle-xe-11g
 ```
 
+By default, the passeord verification is disable(password never expired). If you want it back, run this:
+```
+docker run -d -p 49160:22 -p 49161:1521 -e ORACLE_PASSWORD_VERIFY=true wnameless/oracle-xe-11g
+```
+
 Connect database with following setting:
 ```
 hostname: localhost
@@ -52,3 +57,4 @@ FROM wnameless/oracle-xe-11g
 
 ADD init.sql /docker-entrypoint-initdb.d/
 ```
+After initialization, all files under /docker-entrypoint-initdb.d will be moved to /docker-entrypoint-initdb.d.bak

From 185cacd47f8c5e3e09736a9dd2eb2452f126a2f1 Mon Sep 17 00:00:00 2001
From: wmw <wnameless@gmail.com>
Date: Sat, 26 Aug 2017 10:20:56 +0800
Subject: [PATCH 11/42] Add disable disk asynch IO option

---
 assets/startup.sh | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/assets/startup.sh b/assets/startup.sh
index 38fed70..0271ca1 100644
--- a/assets/startup.sh
+++ b/assets/startup.sh
@@ -15,12 +15,19 @@ export ORACLE_HOME=/u01/app/oracle/product/11.2.0/xe
 export PATH=$ORACLE_HOME/bin:$PATH
 export ORACLE_SID=XE
 
-echo "ALTER PROFILE DEFAULT LIMIT PASSWORD_VERIFY_FUNCTION NULL;" | sqlplus -s SYSTEM/oracle
+if ! [ "$ORACLE_PASSWORD_VERIFY" = true ]; then
+  echo "ALTER PROFILE DEFAULT LIMIT PASSWORD_VERIFY_FUNCTION NULL;" | sqlplus -s SYSTEM/oracle
+end
 
 if [ "$ORACLE_ALLOW_REMOTE" = true ]; then
   echo "alter system disable restricted session;" | sqlplus -s SYSTEM/oracle
 fi
 
+if [ "$ORACLE_DISABLE_ASYNCH_IO" = true ]; then
+  echo "ALTER SYSTEM SET disk_asynch_io = FALSE SCOPE = SPFILE;" | sqlplus -s SYSTEM/oracle
+  service oracle-xe restart
+fi
+
 for f in /docker-entrypoint-initdb.d/*; do
   case "$f" in
     *.sh)     echo "$0: running $f"; . "$f" ;;

From 378271e426aff5d717cbd93184398a84107aaa0e Mon Sep 17 00:00:00 2001
From: wmw <wnameless@gmail.com>
Date: Sat, 26 Aug 2017 10:22:31 +0800
Subject: [PATCH 12/42] Update README.md

---
 README.md | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/README.md b/README.md
index b1a3fce..bef66cf 100644
--- a/README.md
+++ b/README.md
@@ -30,6 +30,11 @@ By default, the passeord verification is disable(password never expired). If you
 docker run -d -p 49160:22 -p 49161:1521 -e ORACLE_PASSWORD_VERIFY=true wnameless/oracle-xe-11g
 ```
 
+For performance concern, you may want to disable the disk asynch IO:
+```
+docker run -d -p 49160:22 -p 49161:1521 -e ORACLE_DISABLE_ASYNCH_IO=true wnameless/oracle-xe-11g
+```
+
 Connect database with following setting:
 ```
 hostname: localhost

From b2117c9069731763827e41e3d40f5030f3160252 Mon Sep 17 00:00:00 2001
From: wmw <wnameless@gmail.com>
Date: Sat, 26 Aug 2017 14:24:44 +0800
Subject: [PATCH 13/42] Add enable XDB option

---
 assets/startup.sh | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/assets/startup.sh b/assets/startup.sh
index 0271ca1..395ae0a 100644
--- a/assets/startup.sh
+++ b/assets/startup.sh
@@ -19,6 +19,11 @@ if ! [ "$ORACLE_PASSWORD_VERIFY" = true ]; then
   echo "ALTER PROFILE DEFAULT LIMIT PASSWORD_VERIFY_FUNCTION NULL;" | sqlplus -s SYSTEM/oracle
 end
 
+if [ "$ORACLE_ENABLE_XDB" = true ]; then
+  echo "ALTER USER XDB ACCOUNT UNLOCK;" | sqlplus -s SYSTEM/oracle
+  echo "ALTER USER XDB IDENTIFIED BY xdb;" | sqlplus -s SYSTEM/oracle
+fi
+
 if [ "$ORACLE_ALLOW_REMOTE" = true ]; then
   echo "alter system disable restricted session;" | sqlplus -s SYSTEM/oracle
 fi

From 0e5217ec1c4f9072537c2169da39f046d42fd273 Mon Sep 17 00:00:00 2001
From: wmw <wnameless@gmail.com>
Date: Sat, 26 Aug 2017 14:31:17 +0800
Subject: [PATCH 14/42] Update README.md

---
 README.md | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/README.md b/README.md
index bef66cf..d75f41d 100644
--- a/README.md
+++ b/README.md
@@ -35,6 +35,16 @@ For performance concern, you may want to disable the disk asynch IO:
 docker run -d -p 49160:22 -p 49161:1521 -e ORACLE_DISABLE_ASYNCH_IO=true wnameless/oracle-xe-11g
 ```
 
+For XDB user, run this:
+```
+docker run -d -p 49160:22 -p 49161:1521 -e ORACLE_ENABLE_XDB=true wnameless/oracle-xe-11g
+```
+```
+# Login http://localhost:8080 with following credential:
+username: XDB
+password: xdb
+```
+
 Connect database with following setting:
 ```
 hostname: localhost

From 58ed78c891cb0ceca7844204037196de4b0e0cb2 Mon Sep 17 00:00:00 2001
From: wmw <wnameless@gmail.com>
Date: Sat, 26 Aug 2017 15:03:10 +0800
Subject: [PATCH 15/42] Fix startup.sh typo

---
 assets/startup.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/assets/startup.sh b/assets/startup.sh
index 395ae0a..686fed1 100644
--- a/assets/startup.sh
+++ b/assets/startup.sh
@@ -17,7 +17,7 @@ export ORACLE_SID=XE
 
 if ! [ "$ORACLE_PASSWORD_VERIFY" = true ]; then
   echo "ALTER PROFILE DEFAULT LIMIT PASSWORD_VERIFY_FUNCTION NULL;" | sqlplus -s SYSTEM/oracle
-end
+fi
 
 if [ "$ORACLE_ENABLE_XDB" = true ]; then
   echo "ALTER USER XDB ACCOUNT UNLOCK;" | sqlplus -s SYSTEM/oracle

From 5798b4db0df963b10f9aaf2809523facaf1e1fc0 Mon Sep 17 00:00:00 2001
From: wmw <wnameless@gmail.com>
Date: Mon, 28 Aug 2017 06:32:41 +0800
Subject: [PATCH 16/42] Revert init script feature to previous version

---
 assets/setup.sh   | 1 -
 assets/startup.sh | 4 ----
 2 files changed, 5 deletions(-)

diff --git a/assets/setup.sh b/assets/setup.sh
index 551df1d..19be684 100755
--- a/assets/setup.sh
+++ b/assets/setup.sh
@@ -46,6 +46,5 @@ rm -r /assets/
 
 # Create initialization script folders
 mkdir /docker-entrypoint-initdb.d
-mkdir /docker-entrypoint-initdb.d.bak
 
 exit $?
diff --git a/assets/startup.sh b/assets/startup.sh
index 686fed1..ee7d692 100644
--- a/assets/startup.sh
+++ b/assets/startup.sh
@@ -41,7 +41,3 @@ for f in /docker-entrypoint-initdb.d/*; do
   esac
   echo
 done
-
-if [ "$(ls -A /docker-entrypoint-initdb.d)" ]; then
-  mv /docker-entrypoint-initdb.d/* /docker-entrypoint-initdb.d.bak
-fi

From 199446dac94769b5238cf23a9ded5b79aee2996a Mon Sep 17 00:00:00 2001
From: wmw <wnameless@gmail.com>
Date: Mon, 28 Aug 2017 06:33:31 +0800
Subject: [PATCH 17/42] Update README.md

---
 README.md | 1 -
 1 file changed, 1 deletion(-)

diff --git a/README.md b/README.md
index d75f41d..554c070 100644
--- a/README.md
+++ b/README.md
@@ -72,4 +72,3 @@ FROM wnameless/oracle-xe-11g
 
 ADD init.sql /docker-entrypoint-initdb.d/
 ```
-After initialization, all files under /docker-entrypoint-initdb.d will be moved to /docker-entrypoint-initdb.d.bak

From 68656b49db170569e6517603837c2d2742113ca7 Mon Sep 17 00:00:00 2001
From: wmw <wnameless@gmail.com>
Date: Sun, 3 Sep 2017 08:55:56 +0800
Subject: [PATCH 18/42] Change password life time to unlimited

---
 assets/startup.sh | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/assets/startup.sh b/assets/startup.sh
index ee7d692..f6fda10 100644
--- a/assets/startup.sh
+++ b/assets/startup.sh
@@ -17,6 +17,8 @@ export ORACLE_SID=XE
 
 if ! [ "$ORACLE_PASSWORD_VERIFY" = true ]; then
   echo "ALTER PROFILE DEFAULT LIMIT PASSWORD_VERIFY_FUNCTION NULL;" | sqlplus -s SYSTEM/oracle
+  echo "alter profile DEFAULT limit password_life_time UNLIMITED;" | sqlplus -s SYSTEM/oracle
+  echo "alter user SYSTEM identified by oracle account unlock;" | sqlplus -s SYSTEM/oracle
 fi
 
 if [ "$ORACLE_ENABLE_XDB" = true ]; then

From 84f7c1c2e376737e65720089c22524590cde321c Mon Sep 17 00:00:00 2001
From: Houziaux mike <Stahlilistenvoid@gmail.com>
Date: Wed, 18 Oct 2017 20:07:23 +0200
Subject: [PATCH 19/42] fix doc for web interface -> -p 8080 and add test to
 verify with curl

---
 README.md | 16 +++++++++++++++-
 1 file changed, 15 insertions(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 554c070..46b616d 100644
--- a/README.md
+++ b/README.md
@@ -37,8 +37,22 @@ docker run -d -p 49160:22 -p 49161:1521 -e ORACLE_DISABLE_ASYNCH_IO=true wnamele
 
 For XDB user, run this:
 ```
-docker run -d -p 49160:22 -p 49161:1521 -e ORACLE_ENABLE_XDB=true wnameless/oracle-xe-11g
+docker run -d -p 49160:22 -p 49161:1521 -p 8080:8080 -e ORACLE_ENABLE_XDB=true wnameless/oracle-xe-11g
 ```
+
+Check if localhost:8080 work
+```
+curl -XGET "http://localhost:8080"
+```
+You will show
+```
+<!DOCTYPE HTML PUBLIC "-//IETF//DTD HTML 2.0//EN">
+<HTML><HEAD>
+<TITLE>401 Unauthorized</TITLE>
+</HEAD><BODY><H1>Unauthorized</H1>
+</BODY></HTML>
+```
+
 ```
 # Login http://localhost:8080 with following credential:
 username: XDB

From cedfd446b8eb23407a7169b98b26255ac52cf1d6 Mon Sep 17 00:00:00 2001
From: wmw <wnameless@gmail.com>
Date: Thu, 19 Oct 2017 12:07:50 +0800
Subject: [PATCH 20/42] Fix typo

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 554c070..1690190 100644
--- a/README.md
+++ b/README.md
@@ -25,7 +25,7 @@ Run this, if you want the database to be connected remotely:
 docker run -d -p 49160:22 -p 49161:1521 -e ORACLE_ALLOW_REMOTE=true wnameless/oracle-xe-11g
 ```
 
-By default, the passeord verification is disable(password never expired). If you want it back, run this:
+By default, the password verification is disable(password never expired). If you want it back, run this:
 ```
 docker run -d -p 49160:22 -p 49161:1521 -e ORACLE_PASSWORD_VERIFY=true wnameless/oracle-xe-11g
 ```

From 5f148c2a6a62d70d7346ee287eac9f7e8ffbe059 Mon Sep 17 00:00:00 2001
From: wmw <wnameless@gmail.com>
Date: Thu, 19 Oct 2017 12:27:40 +0800
Subject: [PATCH 21/42] Update README.md

---
 README.md | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/README.md b/README.md
index f81d83b..a9aa96d 100644
--- a/README.md
+++ b/README.md
@@ -10,11 +10,6 @@ This **Dockerfile** is a [trusted build](https://registry.hub.docker.com/u/wname
 docker pull wnameless/oracle-xe-11g
 ```
 
-### Installation(with older Ubuntu 14.04.4)
-```
-docker pull wnameless/oracle-xe-11g:14.04.4
-```
-
 Run with 22 and 1521 ports opened:
 ```
 docker run -d -p 49160:22 -p 49161:1521 wnameless/oracle-xe-11g

From 95a2028f69442b1cf2e73536dee78a712e900cd0 Mon Sep 17 00:00:00 2001
From: wmw <wnameless@gmail.com>
Date: Thu, 12 Apr 2018 23:29:15 +0700
Subject: [PATCH 22/42] Disable password expiration

---
 assets/setup.sh | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/assets/setup.sh b/assets/setup.sh
index 19be684..4a87a3b 100755
--- a/assets/setup.sh
+++ b/assets/setup.sh
@@ -42,9 +42,18 @@ mv /assets/startup.sh /usr/sbin/startup.sh &&
 chmod +x /usr/sbin/startup.sh &&
 
 # Remove installation files
-rm -r /assets/
+rm -r /assets/ &&
 
 # Create initialization script folders
 mkdir /docker-entrypoint-initdb.d
 
+# Disable password expiration
+export ORACLE_HOME=/u01/app/oracle/product/11.2.0/xe
+export PATH=$ORACLE_HOME/bin:$PATH
+export ORACLE_SID=XE
+
+echo "ALTER PROFILE DEFAULT LIMIT PASSWORD_VERIFY_FUNCTION NULL;" | sqlplus -s SYSTEM/oracle
+echo "alter profile DEFAULT limit password_life_time UNLIMITED;" | sqlplus -s SYSTEM/oracle
+echo "alter user SYSTEM identified by oracle account unlock;" | sqlplus -s SYSTEM/oracle
+
 exit $?

From 88c380a6c09d916734bff198a4d942e232ccb77a Mon Sep 17 00:00:00 2001
From: wmw <wnameless@gmail.com>
Date: Thu, 12 Apr 2018 23:29:54 +0700
Subject: [PATCH 23/42] Remove ORACLE_PASSWORD_VERIFY option

---
 assets/startup.sh | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/assets/startup.sh b/assets/startup.sh
index f6fda10..3c1cfea 100644
--- a/assets/startup.sh
+++ b/assets/startup.sh
@@ -15,12 +15,6 @@ export ORACLE_HOME=/u01/app/oracle/product/11.2.0/xe
 export PATH=$ORACLE_HOME/bin:$PATH
 export ORACLE_SID=XE
 
-if ! [ "$ORACLE_PASSWORD_VERIFY" = true ]; then
-  echo "ALTER PROFILE DEFAULT LIMIT PASSWORD_VERIFY_FUNCTION NULL;" | sqlplus -s SYSTEM/oracle
-  echo "alter profile DEFAULT limit password_life_time UNLIMITED;" | sqlplus -s SYSTEM/oracle
-  echo "alter user SYSTEM identified by oracle account unlock;" | sqlplus -s SYSTEM/oracle
-fi
-
 if [ "$ORACLE_ENABLE_XDB" = true ]; then
   echo "ALTER USER XDB ACCOUNT UNLOCK;" | sqlplus -s SYSTEM/oracle
   echo "ALTER USER XDB IDENTIFIED BY xdb;" | sqlplus -s SYSTEM/oracle

From e40f3fc1bc1526abe9531cbe14638484fb191288 Mon Sep 17 00:00:00 2001
From: wmw <wnameless@gmail.com>
Date: Thu, 12 Apr 2018 23:30:47 +0700
Subject: [PATCH 24/42] Update README.md

---
 README.md | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/README.md b/README.md
index a9aa96d..e2e2209 100644
--- a/README.md
+++ b/README.md
@@ -20,11 +20,6 @@ Run this, if you want the database to be connected remotely:
 docker run -d -p 49160:22 -p 49161:1521 -e ORACLE_ALLOW_REMOTE=true wnameless/oracle-xe-11g
 ```
 
-By default, the password verification is disable(password never expired). If you want it back, run this:
-```
-docker run -d -p 49160:22 -p 49161:1521 -e ORACLE_PASSWORD_VERIFY=true wnameless/oracle-xe-11g
-```
-
 For performance concern, you may want to disable the disk asynch IO:
 ```
 docker run -d -p 49160:22 -p 49161:1521 -e ORACLE_DISABLE_ASYNCH_IO=true wnameless/oracle-xe-11g
@@ -54,6 +49,7 @@ username: XDB
 password: xdb
 ```
 
+By default, the password verification is disable(password never expired)
 Connect database with following setting:
 ```
 hostname: localhost

From f65628eb9f264d2c8e3d4604c5bcb14a5dad9b44 Mon Sep 17 00:00:00 2001
From: wmw <wnameless@gmail.com>
Date: Thu, 12 Apr 2018 23:41:35 +0700
Subject: [PATCH 25/42] Update README.md

---
 README.md | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/README.md b/README.md
index e2e2209..31a9c55 100644
--- a/README.md
+++ b/README.md
@@ -5,11 +5,13 @@ Oracle Express Edition 11g Release 2 on Ubuntu 16.04 LTS
 
 This **Dockerfile** is a [trusted build](https://registry.hub.docker.com/u/wnameless/oracle-xe-11g/) of [Docker Registry](https://registry.hub.docker.com/).
 
-### Installation(with Ubuntu 16.04)
+## Installation(with Ubuntu 16.04)
 ```
 docker pull wnameless/oracle-xe-11g
 ```
 
+## Quick Start
+
 Run with 22 and 1521 ports opened:
 ```
 docker run -d -p 49160:22 -p 49161:1521 wnameless/oracle-xe-11g
@@ -49,7 +51,7 @@ username: XDB
 password: xdb
 ```
 
-By default, the password verification is disable(password never expired)
+By default, the password verification is disable(password never expired)<br/>
 Connect database with following setting:
 ```
 hostname: localhost

From b16728a2bc4d5313910f1e648c0759d1f4ec02a9 Mon Sep 17 00:00:00 2001
From: wmw <wnameless@gmail.com>
Date: Sat, 28 Apr 2018 21:42:14 +0800
Subject: [PATCH 26/42] Upgrade Ubuntu to 18.04 and remove SSH server

---
 Dockerfile      |  4 ++--
 README.md       | 26 +++++++++++++-------------
 assets/setup.sh | 15 +++------------
 3 files changed, 18 insertions(+), 27 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index d9d88f9..71bdacf 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,4 +1,4 @@
-FROM ubuntu:16.04
+FROM ubuntu:18.04
 
 MAINTAINER Wei-Ming Wu <wnameless@gmail.com>
 
@@ -9,4 +9,4 @@ EXPOSE 22
 EXPOSE 1521
 EXPOSE 8080
 
-CMD /usr/sbin/startup.sh && /usr/sbin/sshd -D
+CMD /usr/sbin/startup.sh && tail -f /dev/null
diff --git a/README.md b/README.md
index 31a9c55..9a3ca2f 100644
--- a/README.md
+++ b/README.md
@@ -1,35 +1,41 @@
 docker-oracle-xe-11g
 ============================
 
-Oracle Express Edition 11g Release 2 on Ubuntu 16.04 LTS
+Oracle Express Edition 11g Release 2 on Ubuntu 18.04 LTS
 
 This **Dockerfile** is a [trusted build](https://registry.hub.docker.com/u/wnameless/oracle-xe-11g/) of [Docker Registry](https://registry.hub.docker.com/).
 
-## Installation(with Ubuntu 16.04)
+## Installation(with Ubuntu 18.04)
 ```
 docker pull wnameless/oracle-xe-11g
 ```
+SSH server has been removed since 18.04, please use "docker exec" or 16.04 instead.
+
+## Installation(with Ubuntu 16.04)
+```
+docker pull wnameless/oracle-xe-11g:16.04
+```
 
 ## Quick Start
 
-Run with 22 and 1521 ports opened:
+Run with 1521 port opened:
 ```
-docker run -d -p 49160:22 -p 49161:1521 wnameless/oracle-xe-11g
+docker run -d -p 49161:1521 wnameless/oracle-xe-11g
 ```
 
 Run this, if you want the database to be connected remotely:
 ```
-docker run -d -p 49160:22 -p 49161:1521 -e ORACLE_ALLOW_REMOTE=true wnameless/oracle-xe-11g
+docker run -d -p 49161:1521 -e ORACLE_ALLOW_REMOTE=true wnameless/oracle-xe-11g
 ```
 
 For performance concern, you may want to disable the disk asynch IO:
 ```
-docker run -d -p 49160:22 -p 49161:1521 -e ORACLE_DISABLE_ASYNCH_IO=true wnameless/oracle-xe-11g
+docker run -d -p 49161:1521 -e ORACLE_DISABLE_ASYNCH_IO=true wnameless/oracle-xe-11g
 ```
 
 For XDB user, run this:
 ```
-docker run -d -p 49160:22 -p 49161:1521 -p 8080:8080 -e ORACLE_ENABLE_XDB=true wnameless/oracle-xe-11g
+docker run -d -p 49161:1521 -p 8080:8080 -e ORACLE_ENABLE_XDB=true wnameless/oracle-xe-11g
 ```
 
 Check if localhost:8080 work
@@ -66,12 +72,6 @@ Password for SYS & SYSTEM
 oracle
 ```
 
-Login by SSH
-```
-ssh root@localhost -p 49160
-password: admin
-```
-
 Support custom DB Initialization
 ```
 # Dockerfile
diff --git a/assets/setup.sh b/assets/setup.sh
index 4a87a3b..1342a0d 100755
--- a/assets/setup.sh
+++ b/assets/setup.sh
@@ -3,18 +3,8 @@
 # avoid dpkg frontend dialog / frontend warnings
 export DEBIAN_FRONTEND=noninteractive
 
-cat /assets/oracle-xe_11.2.0-1.0_amd64.deba* > /assets/oracle-xe_11.2.0-1.0_amd64.deb
-
-# Install OpenSSH
-apt-get update &&
-apt-get install -y openssh-server &&
-mkdir /var/run/sshd &&
-echo 'root:admin' | chpasswd &&
-sed -i 's/^PermitRootLogin .*/PermitRootLogin yes/' /etc/ssh/sshd_config &&
-sed -i 's/session\s*required\s*pam_loginuid.so/session optional pam_loginuid.so/g' /etc/pam.d/sshd &&
-echo 'export VISIBLE=now' >> /etc/profile &&
-
 # Prepare to install Oracle
+apt-get update &&
 apt-get install -y libaio1 net-tools bc &&
 ln -s /usr/bin/awk /bin/awk &&
 mkdir /var/lock/subsys &&
@@ -22,6 +12,7 @@ mv /assets/chkconfig /sbin/chkconfig &&
 chmod 755 /sbin/chkconfig &&
 
 # Install Oracle
+cat /assets/oracle-xe_11.2.0-1.0_amd64.deba* > /assets/oracle-xe_11.2.0-1.0_amd64.deb &&
 dpkg --install /assets/oracle-xe_11.2.0-1.0_amd64.deb &&
 
 # Backup listener.ora as template
@@ -47,7 +38,7 @@ rm -r /assets/ &&
 # Create initialization script folders
 mkdir /docker-entrypoint-initdb.d
 
-# Disable password expiration
+# Disable Oracle password expiration
 export ORACLE_HOME=/u01/app/oracle/product/11.2.0/xe
 export PATH=$ORACLE_HOME/bin:$PATH
 export ORACLE_SID=XE

From 8653c81942399052b94b49c459ac9e8ffb20fcd0 Mon Sep 17 00:00:00 2001
From: wmw <wnameless@gmail.com>
Date: Mon, 30 Apr 2018 10:16:41 +0800
Subject: [PATCH 27/42] Add .gitignore

---
 .gitignore | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.gitignore b/.gitignore
index e43b0f9..d825d8a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 .DS_Store
+.project

From 32fd16aeb290d7c54ffa4f49b4f69dc479a9a084 Mon Sep 17 00:00:00 2001
From: wmw <wnameless@gmail.com>
Date: Wed, 30 May 2018 01:36:38 +0800
Subject: [PATCH 28/42] Set up default password for APEX ADMIN user

---
 README.md                   | 22 +++++++---------------
 assets/apex-default-pwd.sql | 25 +++++++++++++++++++++++++
 assets/setup.sh             |  7 ++++---
 3 files changed, 36 insertions(+), 18 deletions(-)
 create mode 100644 assets/apex-default-pwd.sql

diff --git a/README.md b/README.md
index 9a3ca2f..c5067b6 100644
--- a/README.md
+++ b/README.md
@@ -33,28 +33,20 @@ For performance concern, you may want to disable the disk asynch IO:
 docker run -d -p 49161:1521 -e ORACLE_DISABLE_ASYNCH_IO=true wnameless/oracle-xe-11g
 ```
 
-For XDB user, run this:
+Enable XDB user with default password: xdb, run this:
 ```
-docker run -d -p 49161:1521 -p 8080:8080 -e ORACLE_ENABLE_XDB=true wnameless/oracle-xe-11g
+docker run -d -p 49161:1521 -e ORACLE_ENABLE_XDB=true wnameless/oracle-xe-11g
 ```
 
-Check if localhost:8080 work
+For APEX user:
 ```
-curl -XGET "http://localhost:8080"
-```
-You will show
-```
-<!DOCTYPE HTML PUBLIC "-//IETF//DTD HTML 2.0//EN">
-<HTML><HEAD>
-<TITLE>401 Unauthorized</TITLE>
-</HEAD><BODY><H1>Unauthorized</H1>
-</BODY></HTML>
+docker run -d -p 49161:1521 -p 8080:8080 wnameless/oracle-xe-11g
 ```
 
 ```
-# Login http://localhost:8080 with following credential:
-username: XDB
-password: xdb
+# Login http://localhost:8080/apex/apex_admin with following credential:
+username: ADMIN
+password: admin
 ```
 
 By default, the password verification is disable(password never expired)<br/>
diff --git a/assets/apex-default-pwd.sql b/assets/apex-default-pwd.sql
new file mode 100644
index 0000000..65e5b70
--- /dev/null
+++ b/assets/apex-default-pwd.sql
@@ -0,0 +1,25 @@
+alter session set current_schema = APEX_040000;
+
+begin
+
+    wwv_flow_security.g_security_group_id := 10;
+    wwv_flow_security.g_user := 'ADMIN';
+    wwv_flow_security.g_import_in_progress := true;
+
+    for c1 in (select user_id
+                 from wwv_flow_fnd_user
+                where security_group_id = wwv_flow_security.g_security_group_id
+                  and user_name = wwv_flow_security.g_user) loop
+
+        wwv_flow_fnd_user_api.edit_fnd_user(
+            p_user_id       => c1.user_id,
+            p_user_name     => wwv_flow_security.g_user,
+            p_web_password  => 'admin',
+            p_new_password  => 'admin');
+    end loop;
+
+    wwv_flow_security.g_import_in_progress := false;
+
+end;
+/
+commit;
\ No newline at end of file
diff --git a/assets/setup.sh b/assets/setup.sh
index 1342a0d..730a5a8 100755
--- a/assets/setup.sh
+++ b/assets/setup.sh
@@ -32,9 +32,6 @@ echo 'export ORACLE_SID=XE' >> /etc/bash.bashrc &&
 mv /assets/startup.sh /usr/sbin/startup.sh &&
 chmod +x /usr/sbin/startup.sh &&
 
-# Remove installation files
-rm -r /assets/ &&
-
 # Create initialization script folders
 mkdir /docker-entrypoint-initdb.d
 
@@ -46,5 +43,9 @@ export ORACLE_SID=XE
 echo "ALTER PROFILE DEFAULT LIMIT PASSWORD_VERIFY_FUNCTION NULL;" | sqlplus -s SYSTEM/oracle
 echo "alter profile DEFAULT limit password_life_time UNLIMITED;" | sqlplus -s SYSTEM/oracle
 echo "alter user SYSTEM identified by oracle account unlock;" | sqlplus -s SYSTEM/oracle
+cat /assets/apex-default-pwd.sql | sqlplus -s SYSTEM/oracle
+
+# Remove installation files
+rm -r /assets/
 
 exit $?

From 64ded1383d497c54681fe3ec4049b43068ca43a2 Mon Sep 17 00:00:00 2001
From: wmw <wnameless@gmail.com>
Date: Fri, 8 Jun 2018 17:47:09 +0800
Subject: [PATCH 29/42] Update README.md

---
 README.md | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/README.md b/README.md
index c5067b6..73bd27b 100644
--- a/README.md
+++ b/README.md
@@ -49,6 +49,17 @@ username: ADMIN
 password: admin
 ```
 
+For latest APEX(18.1) user, please pull wnameless/oracle-xe-11g:18.04-apex first:
+```
+docker run -d -p 49161:1521 -p 8080:8080 wnameless/oracle-xe-11g:18.04-apex
+```
+
+```
+# Login http://localhost:8080/apex/apex_admin with following credential:
+username: ADMIN
+password: Oracle_11g
+```
+
 By default, the password verification is disable(password never expired)<br/>
 Connect database with following setting:
 ```

From 03b482a021338a8863ffccb7bf647219e2cf9954 Mon Sep 17 00:00:00 2001
From: Danny Bulshtein <dannyb7878@gmail.com>
Date: Wed, 4 Jul 2018 22:36:30 +0300
Subject: [PATCH 30/42] Update readme

---
 README.md | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 9a3ca2f..3df2328 100644
--- a/README.md
+++ b/README.md
@@ -72,10 +72,12 @@ Password for SYS & SYSTEM
 oracle
 ```
 
-Support custom DB Initialization
+Support custom DB Initialization and running shell scripts
 ```
 # Dockerfile
 FROM wnameless/oracle-xe-11g
 
 ADD init.sql /docker-entrypoint-initdb.d/
+ADD script.sh /docker-entrypoint-initdb.d/
 ```
+Running order is alphabetically. 

From b4cf382a1d5f2e1f959024add7039e1107687524 Mon Sep 17 00:00:00 2001
From: Sergei Morozov <morozov@tut.by>
Date: Thu, 24 Jan 2019 16:32:34 -0800
Subject: [PATCH 31/42] Eliminate misleading initialization message

When the container starts, the following output is produced:
```
Starting Oracle Net Listener.
Starting Oracle Database 11g Express Edition instance.

/usr/sbin/startup.sh: ignoring /docker-entrypoint-initdb.d/*
```

It looks like it ignores the entire init directory, however, it only means that it's empty, and the `*` symbol in the `for` loop is not resolved to any list of files, therefore it's used as is and is ignored since it's not a `*.sh` or `*.sql` file.

With the fix, the script will ignore the unresolved wildcard.
---
 assets/startup.sh | 1 +
 1 file changed, 1 insertion(+)

diff --git a/assets/startup.sh b/assets/startup.sh
index 3c1cfea..af1dc32 100644
--- a/assets/startup.sh
+++ b/assets/startup.sh
@@ -30,6 +30,7 @@ if [ "$ORACLE_DISABLE_ASYNCH_IO" = true ]; then
 fi
 
 for f in /docker-entrypoint-initdb.d/*; do
+  [ -f "$f" ] || continue
   case "$f" in
     *.sh)     echo "$0: running $f"; . "$f" ;;
     *.sql)    echo "$0: running $f"; echo "exit" | /u01/app/oracle/product/11.2.0/xe/bin/sqlplus "SYS/oracle" AS SYSDBA @"$f"; echo ;;

From da8567d95f8c13e79e8a04146135ae4bb67ce27f Mon Sep 17 00:00:00 2001
From: wmw <wnameless@gmail.com>
Date: Wed, 13 Feb 2019 21:46:43 -0500
Subject: [PATCH 32/42] Update README.md

---
 README.md | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 0d716f7..f66ec93 100644
--- a/README.md
+++ b/README.md
@@ -3,7 +3,11 @@ docker-oracle-xe-11g
 
 Oracle Express Edition 11g Release 2 on Ubuntu 18.04 LTS
 
-This **Dockerfile** is a [trusted build](https://registry.hub.docker.com/u/wnameless/oracle-xe-11g/) of [Docker Registry](https://registry.hub.docker.com/).
+<del>This **Dockerfile** is a [trusted build](https://registry.hub.docker.com/u/wnameless/oracle-xe-11g/) of [Docker Registry](https://registry.hub.docker.com/).</del>
+
+Since 2019-Feb-13(the Valentine's day eve) this docker image has been removed by DockerHub due to the Docker DMCA Takedown Notice from the Copyright owner which is the Orale.
+
+Happy Valentine's day!
 
 ## Installation(with Ubuntu 18.04)
 ```

From 854f90061aa00c1a650dee946fae9f7da861f4ad Mon Sep 17 00:00:00 2001
From: wmw <wnameless@gmail.com>
Date: Wed, 13 Feb 2019 22:07:12 -0500
Subject: [PATCH 33/42] Update README.md

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index f66ec93..380a20c 100644
--- a/README.md
+++ b/README.md
@@ -5,7 +5,7 @@ Oracle Express Edition 11g Release 2 on Ubuntu 18.04 LTS
 
 <del>This **Dockerfile** is a [trusted build](https://registry.hub.docker.com/u/wnameless/oracle-xe-11g/) of [Docker Registry](https://registry.hub.docker.com/).</del>
 
-Since 2019-Feb-13(the Valentine's day eve) this docker image has been removed by DockerHub due to the Docker DMCA Takedown Notice from the Copyright owner which is the Orale.
+Since 2019-Feb-13(the Valentine's day eve) this docker image has been removed by DockerHub due to the Docker DMCA Takedown Notice from the Copyright owner which is the Oracle.
 
 Happy Valentine's day!
 

From 05c44d9c3125410f78cb126e74bb83577121f1ec Mon Sep 17 00:00:00 2001
From: TildeHacker <contact@tildehacker.com>
Date: Thu, 28 Feb 2019 05:29:20 +0100
Subject: [PATCH 34/42] Add build instructions to README.md

---
 README.md | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/README.md b/README.md
index 380a20c..dda0f96 100644
--- a/README.md
+++ b/README.md
@@ -9,6 +9,13 @@ Since 2019-Feb-13(the Valentine's day eve) this docker image has been removed by
 
 Happy Valentine's day!
 
+## Installation
+```
+git clone https://github.com/wnameless/docker-oracle-xe-11g.git
+cd docker-oracle-xe-11g
+docker build -t wnameless/oracle-xe-11g .
+```
+
 ## Installation(with Ubuntu 18.04)
 ```
 docker pull wnameless/oracle-xe-11g

From f1344797bb1c7805fb9a98ab3b09b6d9127686b8 Mon Sep 17 00:00:00 2001
From: marcosvidolin <marcosvidolin@gmail.com>
Date: Thu, 8 Aug 2019 22:08:22 -0300
Subject: [PATCH 35/42] Use COPY instead of ADD for files and folders

---
 Dockerfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Dockerfile b/Dockerfile
index 71bdacf..b7d05a9 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -2,7 +2,7 @@ FROM ubuntu:18.04
 
 MAINTAINER Wei-Ming Wu <wnameless@gmail.com>
 
-ADD assets /assets
+COPY assets /assets
 RUN /assets/setup.sh
 
 EXPOSE 22

From 2a8dbed2608efcfbd26ddabc17323f0ed8ff5579 Mon Sep 17 00:00:00 2001
From: marcosvidolin <marcosvidolin@gmail.com>
Date: Thu, 8 Aug 2019 22:09:18 -0300
Subject: [PATCH 36/42] MAINTAINER is deprecated since Docker 1.13.0

---
 Dockerfile | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index b7d05a9..643c464 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,7 +1,5 @@
 FROM ubuntu:18.04
 
-MAINTAINER Wei-Ming Wu <wnameless@gmail.com>
-
 COPY assets /assets
 RUN /assets/setup.sh
 
@@ -9,4 +7,4 @@ EXPOSE 22
 EXPOSE 1521
 EXPOSE 8080
 
-CMD /usr/sbin/startup.sh && tail -f /dev/null
+CMD /usr/sbin/startup.sh && tail -f /dev/null
\ No newline at end of file

From 68034e2ff84ff562dd5fd3a09889fcfbaa9756e5 Mon Sep 17 00:00:00 2001
From: wmw <wnameless@gmail.com>
Date: Sun, 29 Sep 2019 10:47:23 +0800
Subject: [PATCH 37/42] Update README.md

---
 README.md | 39 +++++++++++++++++++++------------------
 1 file changed, 21 insertions(+), 18 deletions(-)

diff --git a/README.md b/README.md
index dda0f96..5321006 100644
--- a/README.md
+++ b/README.md
@@ -5,53 +5,56 @@ Oracle Express Edition 11g Release 2 on Ubuntu 18.04 LTS
 
 <del>This **Dockerfile** is a [trusted build](https://registry.hub.docker.com/u/wnameless/oracle-xe-11g/) of [Docker Registry](https://registry.hub.docker.com/).</del>
 
-Since 2019-Feb-13(the Valentine's day eve) this docker image has been removed by DockerHub due to the Docker DMCA Takedown Notice from the Copyright owner which is the Oracle.
+<del>Since 2019-Feb-13(the Valentine's day eve) this docker image has been removed by DockerHub due to the Docker DMCA Takedown Notice from the Copyright owner which is the Oracle.</del>
 
-Happy Valentine's day!
+<del>Happy Valentine's day!</del>
 
-## Installation
+```diff
++ The new DockerHub [wnameless/oracle-xe-11g-r2] has been released, because
++ the old [wnameless/oracle-xe-11g] is banned by DockerHub and I cannot restore it.
++ Thanks for the help from the staff in Oracle with my DMCA Takedown issue, however this problem
++ is totally ignored by the DockerHub and I barely can't do anything but to open a new repo.
++ Sep 29 2019
+```
+
+## Installation(Local)
 ```
 git clone https://github.com/wnameless/docker-oracle-xe-11g.git
 cd docker-oracle-xe-11g
 docker build -t wnameless/oracle-xe-11g .
 ```
 
-## Installation(with Ubuntu 18.04)
-```
-docker pull wnameless/oracle-xe-11g
-```
-SSH server has been removed since 18.04, please use "docker exec" or 16.04 instead.
-
-## Installation(with Ubuntu 16.04)
+## Installation(DockerHub)
 ```
-docker pull wnameless/oracle-xe-11g:16.04
+docker pull wnameless/oracle-xe-11g-r2
 ```
+SSH server has been removed since 18.04, please use "docker exec"
 
 ## Quick Start
 
 Run with 1521 port opened:
 ```
-docker run -d -p 49161:1521 wnameless/oracle-xe-11g
+docker run -d -p 49161:1521 wnameless/oracle-xe-11g-r2
 ```
 
 Run this, if you want the database to be connected remotely:
 ```
-docker run -d -p 49161:1521 -e ORACLE_ALLOW_REMOTE=true wnameless/oracle-xe-11g
+docker run -d -p 49161:1521 -e ORACLE_ALLOW_REMOTE=true wnameless/oracle-xe-11g-r2
 ```
 
 For performance concern, you may want to disable the disk asynch IO:
 ```
-docker run -d -p 49161:1521 -e ORACLE_DISABLE_ASYNCH_IO=true wnameless/oracle-xe-11g
+docker run -d -p 49161:1521 -e ORACLE_DISABLE_ASYNCH_IO=true wnameless/oracle-xe-11g-r2
 ```
 
 Enable XDB user with default password: xdb, run this:
 ```
-docker run -d -p 49161:1521 -e ORACLE_ENABLE_XDB=true wnameless/oracle-xe-11g
+docker run -d -p 49161:1521 -e ORACLE_ENABLE_XDB=true wnameless/oracle-xe-11g-r2
 ```
 
 For APEX user:
 ```
-docker run -d -p 49161:1521 -p 8080:8080 wnameless/oracle-xe-11g
+docker run -d -p 49161:1521 -p 8080:8080 wnameless/oracle-xe-11g-r2
 ```
 
 ```
@@ -60,7 +63,7 @@ username: ADMIN
 password: admin
 ```
 
-For latest APEX(18.1) user, please pull wnameless/oracle-xe-11g:18.04-apex first:
+For latest APEX(18.1) user, please pull wnameless/oracle-xe-11g-r2:18.04-apex first:
 ```
 docker run -d -p 49161:1521 -p 8080:8080 wnameless/oracle-xe-11g:18.04-apex
 ```
@@ -89,7 +92,7 @@ oracle
 Support custom DB Initialization and running shell scripts
 ```
 # Dockerfile
-FROM wnameless/oracle-xe-11g
+FROM wnameless/oracle-xe-11g-r2
 
 ADD init.sql /docker-entrypoint-initdb.d/
 ADD script.sh /docker-entrypoint-initdb.d/

From 33c2f72df9f2a0ccd0c8e426e018c83bced9713c Mon Sep 17 00:00:00 2001
From: Craig Andrews <candrews@integralblue.com>
Date: Thu, 3 Oct 2019 13:30:13 -0400
Subject: [PATCH 38/42] Abort on errors

If an error occurs, stop with an error.

This ensure that unexpected errors stop execution instead of allowing startup to proceed with an unknown/unexpected state.
---
 assets/startup.sh | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/assets/startup.sh b/assets/startup.sh
index af1dc32..34f3c3d 100644
--- a/assets/startup.sh
+++ b/assets/startup.sh
@@ -1,13 +1,14 @@
 #!/bin/bash
+set -Eeuo pipefail
 LISTENER_ORA=/u01/app/oracle/product/11.2.0/xe/network/admin/listener.ora
 TNSNAMES_ORA=/u01/app/oracle/product/11.2.0/xe/network/admin/tnsnames.ora
 
-cp "${LISTENER_ORA}.tmpl" "$LISTENER_ORA" &&
-sed -i "s/%hostname%/$HOSTNAME/g" "${LISTENER_ORA}" &&
-sed -i "s/%port%/1521/g" "${LISTENER_ORA}" &&
-cp "${TNSNAMES_ORA}.tmpl" "$TNSNAMES_ORA" &&
-sed -i "s/%hostname%/$HOSTNAME/g" "${TNSNAMES_ORA}" &&
-sed -i "s/%port%/1521/g" "${TNSNAMES_ORA}" &&
+cp "${LISTENER_ORA}.tmpl" "$LISTENER_ORA"
+sed -i "s/%hostname%/$HOSTNAME/g" "${LISTENER_ORA}"
+sed -i "s/%port%/1521/g" "${LISTENER_ORA}"
+cp "${TNSNAMES_ORA}.tmpl" "$TNSNAMES_ORA"
+sed -i "s/%hostname%/$HOSTNAME/g" "${TNSNAMES_ORA}"
+sed -i "s/%port%/1521/g" "${TNSNAMES_ORA}"
 
 service oracle-xe start
 

From b2ca1125bd763e6469248665c32606126e2f4780 Mon Sep 17 00:00:00 2001
From: Craig Andrews <candrews@integralblue.com>
Date: Thu, 3 Oct 2019 13:32:20 -0400
Subject: [PATCH 39/42] Echo "DATABASE IS READY TO USE!" when ready

This message is the same as what Oracle's image displays, allowing other programs that look for this message to find it making this image compatible with Oracle's.
---
 assets/startup.sh | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/assets/startup.sh b/assets/startup.sh
index af1dc32..79193ed 100644
--- a/assets/startup.sh
+++ b/assets/startup.sh
@@ -38,3 +38,7 @@ for f in /docker-entrypoint-initdb.d/*; do
   esac
   echo
 done
+
+echo "#########################"
+echo "DATABASE IS READY TO USE!"
+echo "#########################"

From f20a6d85704abdf6998f27ab3ecfc04a30e67e69 Mon Sep 17 00:00:00 2001
From: Craig Andrews <candrews@integralblue.com>
Date: Thu, 3 Oct 2019 13:35:35 -0400
Subject: [PATCH 40/42] Abort on errors

If an error occurs, stop with an error.

This ensure that unexpected errors stop execution instead of allowing setup to proceed with an unknown/unexpected state.
---
 assets/setup.sh | 37 +++++++++++++++++++------------------
 1 file changed, 19 insertions(+), 18 deletions(-)

diff --git a/assets/setup.sh b/assets/setup.sh
index 730a5a8..2f0dfa3 100755
--- a/assets/setup.sh
+++ b/assets/setup.sh
@@ -1,36 +1,37 @@
 #!/bin/bash
+set -Eeuo pipefail
 
 # avoid dpkg frontend dialog / frontend warnings
 export DEBIAN_FRONTEND=noninteractive
 
 # Prepare to install Oracle
-apt-get update &&
-apt-get install -y libaio1 net-tools bc &&
-ln -s /usr/bin/awk /bin/awk &&
-mkdir /var/lock/subsys &&
-mv /assets/chkconfig /sbin/chkconfig &&
-chmod 755 /sbin/chkconfig &&
+apt-get update
+apt-get install -y libaio1 net-tools bc
+ln -s /usr/bin/awk /bin/awk
+mkdir /var/lock/subsys
+mv /assets/chkconfig /sbin/chkconfig
+chmod 755 /sbin/chkconfig
 
 # Install Oracle
-cat /assets/oracle-xe_11.2.0-1.0_amd64.deba* > /assets/oracle-xe_11.2.0-1.0_amd64.deb &&
-dpkg --install /assets/oracle-xe_11.2.0-1.0_amd64.deb &&
+cat /assets/oracle-xe_11.2.0-1.0_amd64.deba* > /assets/oracle-xe_11.2.0-1.0_amd64.deb
+dpkg --install /assets/oracle-xe_11.2.0-1.0_amd64.deb
 
 # Backup listener.ora as template
-cp /u01/app/oracle/product/11.2.0/xe/network/admin/listener.ora /u01/app/oracle/product/11.2.0/xe/network/admin/listener.ora.tmpl &&
-cp /u01/app/oracle/product/11.2.0/xe/network/admin/tnsnames.ora /u01/app/oracle/product/11.2.0/xe/network/admin/tnsnames.ora.tmpl &&
+cp /u01/app/oracle/product/11.2.0/xe/network/admin/listener.ora /u01/app/oracle/product/11.2.0/xe/network/admin/listener.ora.tmpl
+cp /u01/app/oracle/product/11.2.0/xe/network/admin/tnsnames.ora /u01/app/oracle/product/11.2.0/xe/network/admin/tnsnames.ora.tmpl
 
-mv /assets/init.ora /u01/app/oracle/product/11.2.0/xe/config/scripts &&
-mv /assets/initXETemp.ora /u01/app/oracle/product/11.2.0/xe/config/scripts &&
+mv /assets/init.ora /u01/app/oracle/product/11.2.0/xe/config/scripts
+mv /assets/initXETemp.ora /u01/app/oracle/product/11.2.0/xe/config/scripts
 
-printf 8080\\n1521\\noracle\\noracle\\ny\\n | /etc/init.d/oracle-xe configure &&
+printf 8080\\n1521\\noracle\\noracle\\ny\\n | /etc/init.d/oracle-xe configure
 
-echo 'export ORACLE_HOME=/u01/app/oracle/product/11.2.0/xe' >> /etc/bash.bashrc &&
-echo 'export PATH=$ORACLE_HOME/bin:$PATH' >> /etc/bash.bashrc &&
-echo 'export ORACLE_SID=XE' >> /etc/bash.bashrc &&
+echo 'export ORACLE_HOME=/u01/app/oracle/product/11.2.0/xe' >> /etc/bash.bashrc
+echo 'export PATH=$ORACLE_HOME/bin:$PATH' >> /etc/bash.bashrc
+echo 'export ORACLE_SID=XE' >> /etc/bash.bashrc
 
 # Install startup script for container
-mv /assets/startup.sh /usr/sbin/startup.sh &&
-chmod +x /usr/sbin/startup.sh &&
+mv /assets/startup.sh /usr/sbin/startup.sh
+chmod +x /usr/sbin/startup.sh
 
 # Create initialization script folders
 mkdir /docker-entrypoint-initdb.d

From 8271be36f5c55fffc5f2b80e9cf757fd9903c5b7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nicol=C3=B2=20Ribaudo?= <nicolo.ribaudo@gmail.com>
Date: Tue, 29 Oct 2019 17:27:13 +0100
Subject: [PATCH 41/42] Update README.md

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 5321006..14f50cd 100644
--- a/README.md
+++ b/README.md
@@ -65,7 +65,7 @@ password: admin
 
 For latest APEX(18.1) user, please pull wnameless/oracle-xe-11g-r2:18.04-apex first:
 ```
-docker run -d -p 49161:1521 -p 8080:8080 wnameless/oracle-xe-11g:18.04-apex
+docker run -d -p 49161:1521 -p 8080:8080 wnameless/oracle-xe-11g-r2:18.04-apex
 ```
 
 ```

From 06f10fc895ef2ae2c68f4aadb5c18e59bcc0b5cf Mon Sep 17 00:00:00 2001
From: Ramon Balaguer Altadill <rba.cat@gmail.com>
Date: Thu, 18 Jun 2020 11:50:36 +0200
Subject: [PATCH 42/42] Doc: fix command docker run for 18.04

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 5321006..14f50cd 100644
--- a/README.md
+++ b/README.md
@@ -65,7 +65,7 @@ password: admin
 
 For latest APEX(18.1) user, please pull wnameless/oracle-xe-11g-r2:18.04-apex first:
 ```
-docker run -d -p 49161:1521 -p 8080:8080 wnameless/oracle-xe-11g:18.04-apex
+docker run -d -p 49161:1521 -p 8080:8080 wnameless/oracle-xe-11g-r2:18.04-apex
 ```
 
 ```