From 6c257c11a93a5652755aee51a5d9e41cccbeb399 Mon Sep 17 00:00:00 2001
From: Jeremy Lundy <16428663+jlundy2@users.noreply.github.com>
Date: Fri, 11 Sep 2020 12:26:03 -0400
Subject: [PATCH 01/15] Create build-and-push.yml

---
 .github/workflows/build-and-push.yml | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)
 create mode 100644 .github/workflows/build-and-push.yml

diff --git a/.github/workflows/build-and-push.yml b/.github/workflows/build-and-push.yml
new file mode 100644
index 0000000000..5f0f3ccee0
--- /dev/null
+++ b/.github/workflows/build-and-push.yml
@@ -0,0 +1,18 @@
+name: build-and-push
+
+on:
+  push:
+    branches: [ master ]
+  workflow_dispatch:
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v2
+    - name: Build and push Docker images
+      run: |
+        cd dockerfiles
+        ./buildDockerImage.sh -v 18.4.0 -x -o -t jlundy/oracle-db:18.4.0-xe
+        docker login -u ${{ secrets.DOCKERHUB_USERNAME}} -p ${{ secrets.DOCKERHUB_PASSWORD }}
+        docker push jlundy/oracle-db:18.4.0-xe

From 19ec04dd16f3dfcfbdcbc582d2b4ab40b0fe87f3 Mon Sep 17 00:00:00 2001
From: Jeremy Lundy <16428663+jlundy2@users.noreply.github.com>
Date: Fri, 11 Sep 2020 12:27:29 -0400
Subject: [PATCH 02/15] Update build-and-push.yml

---
 .github/workflows/build-and-push.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/build-and-push.yml b/.github/workflows/build-and-push.yml
index 5f0f3ccee0..3fbc95f43a 100644
--- a/.github/workflows/build-and-push.yml
+++ b/.github/workflows/build-and-push.yml
@@ -12,7 +12,7 @@ jobs:
     - uses: actions/checkout@v2
     - name: Build and push Docker images
       run: |
-        cd dockerfiles
+        cd OracleDatabase/SingleInstance/dockerfiles
         ./buildDockerImage.sh -v 18.4.0 -x -o -t jlundy/oracle-db:18.4.0-xe
         docker login -u ${{ secrets.DOCKERHUB_USERNAME}} -p ${{ secrets.DOCKERHUB_PASSWORD }}
         docker push jlundy/oracle-db:18.4.0-xe

From 7510d92887ea31e4b68506953e76fe739405152d Mon Sep 17 00:00:00 2001
From: Jeremy Lundy <16428663+jlundy2@users.noreply.github.com>
Date: Fri, 11 Sep 2020 12:40:05 -0400
Subject: [PATCH 03/15] Update build-and-push.yml

---
 .github/workflows/build-and-push.yml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/build-and-push.yml b/.github/workflows/build-and-push.yml
index 3fbc95f43a..54f5fa8d1f 100644
--- a/.github/workflows/build-and-push.yml
+++ b/.github/workflows/build-and-push.yml
@@ -13,6 +13,7 @@ jobs:
     - name: Build and push Docker images
       run: |
         cd OracleDatabase/SingleInstance/dockerfiles
-        ./buildDockerImage.sh -v 18.4.0 -x -o -t jlundy/oracle-db:18.4.0-xe
+        ./buildDockerImage.sh -v 18.4.0 -x
+        docker tag oracle/database:18.4.0-xe jlundy/oracle-db:18.4.0-xe
         docker login -u ${{ secrets.DOCKERHUB_USERNAME}} -p ${{ secrets.DOCKERHUB_PASSWORD }}
         docker push jlundy/oracle-db:18.4.0-xe

From 9190d2356c541ab44186ead49856a27c74498fa3 Mon Sep 17 00:00:00 2001
From: Jeremy Lundy <16428663+jlundy2@users.noreply.github.com>
Date: Fri, 11 Sep 2020 12:59:16 -0400
Subject: [PATCH 04/15] Update build-and-push.yml

---
 .github/workflows/build-and-push.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/build-and-push.yml b/.github/workflows/build-and-push.yml
index 54f5fa8d1f..31066b3d54 100644
--- a/.github/workflows/build-and-push.yml
+++ b/.github/workflows/build-and-push.yml
@@ -14,6 +14,6 @@ jobs:
       run: |
         cd OracleDatabase/SingleInstance/dockerfiles
         ./buildDockerImage.sh -v 18.4.0 -x
-        docker tag oracle/database:18.4.0-xe jlundy/oracle-db:18.4.0-xe
+        docker tag oracle/database:18.4.0-xe jlundy2/oracle-db:18.4.0-xe
         docker login -u ${{ secrets.DOCKERHUB_USERNAME}} -p ${{ secrets.DOCKERHUB_PASSWORD }}
         docker push jlundy/oracle-db:18.4.0-xe

From f697a44fb1e282050b1c72837d74de1582943268 Mon Sep 17 00:00:00 2001
From: Jeremy Lundy <16428663+jlundy2@users.noreply.github.com>
Date: Fri, 11 Sep 2020 13:22:27 -0400
Subject: [PATCH 05/15] Update build-and-push.yml

---
 .github/workflows/build-and-push.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/build-and-push.yml b/.github/workflows/build-and-push.yml
index 31066b3d54..ddc9e06986 100644
--- a/.github/workflows/build-and-push.yml
+++ b/.github/workflows/build-and-push.yml
@@ -16,4 +16,4 @@ jobs:
         ./buildDockerImage.sh -v 18.4.0 -x
         docker tag oracle/database:18.4.0-xe jlundy2/oracle-db:18.4.0-xe
         docker login -u ${{ secrets.DOCKERHUB_USERNAME}} -p ${{ secrets.DOCKERHUB_PASSWORD }}
-        docker push jlundy/oracle-db:18.4.0-xe
+        docker push jlundy2/oracle-db:18.4.0-xe

From c9c72ac4c6f201086b7bb023357698b0f74cebdf Mon Sep 17 00:00:00 2001
From: Jeremy Lundy <16428663+jlundy2@users.noreply.github.com>
Date: Tue, 22 Sep 2020 17:54:17 -0400
Subject: [PATCH 06/15] Name oradata as volume so permissions work.

---
 OracleDatabase/SingleInstance/dockerfiles/18.4.0/Dockerfile.xe | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/OracleDatabase/SingleInstance/dockerfiles/18.4.0/Dockerfile.xe b/OracleDatabase/SingleInstance/dockerfiles/18.4.0/Dockerfile.xe
index ca6bead715..67b8df51eb 100644
--- a/OracleDatabase/SingleInstance/dockerfiles/18.4.0/Dockerfile.xe
+++ b/OracleDatabase/SingleInstance/dockerfiles/18.4.0/Dockerfile.xe
@@ -76,6 +76,8 @@ RUN chmod ug+x $INSTALL_DIR/*.sh && \
     rm -rf $INSTALL_DIR && \
     chmod ug+x $ORACLE_BASE/*.sh
 
+VOLUME $ORACLE_BASE/oradata
+
 HEALTHCHECK --interval=1m --start-period=5m \
    CMD "$ORACLE_BASE/$CHECK_DB_FILE" >/dev/null || exit 1
 

From a2170ee46a92a14ced68c1e261311b737136663e Mon Sep 17 00:00:00 2001
From: Jeremy Lundy <16428663+jlundy2@users.noreply.github.com>
Date: Wed, 23 Sep 2020 15:26:07 -0400
Subject: [PATCH 07/15] Update Dockerfile.xe

---
 OracleDatabase/SingleInstance/dockerfiles/18.4.0/Dockerfile.xe | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/OracleDatabase/SingleInstance/dockerfiles/18.4.0/Dockerfile.xe b/OracleDatabase/SingleInstance/dockerfiles/18.4.0/Dockerfile.xe
index 67b8df51eb..a4f479e986 100644
--- a/OracleDatabase/SingleInstance/dockerfiles/18.4.0/Dockerfile.xe
+++ b/OracleDatabase/SingleInstance/dockerfiles/18.4.0/Dockerfile.xe
@@ -33,6 +33,8 @@ LABEL "provider"="Oracle"                                               \
       "port.oemexpress"="5500"                                          \
       "port.apex"="8080"
 
+USER oracle:oinstall
+
 # Environment variables required for this build (do NOT change)
 # -------------------------------------------------------------
 ENV ORACLE_BASE=/opt/oracle \

From a4e83845f259bb8737f4f8f4199dea0610bc7464 Mon Sep 17 00:00:00 2001
From: Jeremy Lundy <16428663+jlundy2@users.noreply.github.com>
Date: Wed, 23 Sep 2020 16:17:56 -0400
Subject: [PATCH 08/15] Update Dockerfile.xe

---
 .../dockerfiles/18.4.0/Dockerfile.xe              | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/OracleDatabase/SingleInstance/dockerfiles/18.4.0/Dockerfile.xe b/OracleDatabase/SingleInstance/dockerfiles/18.4.0/Dockerfile.xe
index a4f479e986..db7c794db5 100644
--- a/OracleDatabase/SingleInstance/dockerfiles/18.4.0/Dockerfile.xe
+++ b/OracleDatabase/SingleInstance/dockerfiles/18.4.0/Dockerfile.xe
@@ -33,8 +33,6 @@ LABEL "provider"="Oracle"                                               \
       "port.oemexpress"="5500"                                          \
       "port.apex"="8080"
 
-USER oracle:oinstall
-
 # Environment variables required for this build (do NOT change)
 # -------------------------------------------------------------
 ENV ORACLE_BASE=/opt/oracle \
@@ -49,6 +47,14 @@ ENV ORACLE_BASE=/opt/oracle \
     INSTALL_DIR="$HOME/install" \
     ORACLE_DOCKER_INSTALL="true"
 
+RUN sync && \
+    yum -y install openssl oracle-database-preinstall-18c && \
+    yum -y localinstall $INSTALL_FILE_1 && \
+    rm -rf /var/cache/yum && \
+    rm -rf /var/tmp/yum-* && \
+
+USER oracle:oinstall
+
 # Use second ENV so that variable get substituted
 ENV PATH=$ORACLE_HOME/bin:$PATH
 
@@ -57,13 +63,8 @@ ENV PATH=$ORACLE_HOME/bin:$PATH
 COPY $CHECK_SPACE_FILE $RUN_FILE $PWD_FILE $CHECK_DB_FILE $CONF_FILE $INSTALL_DIR/
 
 RUN chmod ug+x $INSTALL_DIR/*.sh && \
-    sync && \
     $INSTALL_DIR/$CHECK_SPACE_FILE && \
     cd $INSTALL_DIR && \
-    yum -y install openssl oracle-database-preinstall-18c && \
-    yum -y localinstall $INSTALL_FILE_1 && \
-    rm -rf /var/cache/yum && \
-    rm -rf /var/tmp/yum-* && \
     mkdir -p $ORACLE_BASE/scripts/setup && \
     mkdir $ORACLE_BASE/scripts/startup && \
     ln -s $ORACLE_BASE/scripts /docker-entrypoint-initdb.d && \

From d7631361d37c430f5ed73bc6caefb45a984c5c4f Mon Sep 17 00:00:00 2001
From: Jeremy Lundy <16428663+jlundy2@users.noreply.github.com>
Date: Wed, 23 Sep 2020 16:28:34 -0400
Subject: [PATCH 09/15] Update Dockerfile.xe

---
 OracleDatabase/SingleInstance/dockerfiles/18.4.0/Dockerfile.xe | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/OracleDatabase/SingleInstance/dockerfiles/18.4.0/Dockerfile.xe b/OracleDatabase/SingleInstance/dockerfiles/18.4.0/Dockerfile.xe
index db7c794db5..ecd17b032a 100644
--- a/OracleDatabase/SingleInstance/dockerfiles/18.4.0/Dockerfile.xe
+++ b/OracleDatabase/SingleInstance/dockerfiles/18.4.0/Dockerfile.xe
@@ -51,7 +51,7 @@ RUN sync && \
     yum -y install openssl oracle-database-preinstall-18c && \
     yum -y localinstall $INSTALL_FILE_1 && \
     rm -rf /var/cache/yum && \
-    rm -rf /var/tmp/yum-* && \
+    rm -rf /var/tmp/yum-*
 
 USER oracle:oinstall
 

From 063812c27101e5a8c0b87d38c7f4ad67c90deb0f Mon Sep 17 00:00:00 2001
From: Jeremy Lundy <16428663+jlundy2@users.noreply.github.com>
Date: Wed, 23 Sep 2020 16:47:54 -0400
Subject: [PATCH 10/15] Update Dockerfile.xe

---
 .../SingleInstance/dockerfiles/18.4.0/Dockerfile.xe | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/OracleDatabase/SingleInstance/dockerfiles/18.4.0/Dockerfile.xe b/OracleDatabase/SingleInstance/dockerfiles/18.4.0/Dockerfile.xe
index ecd17b032a..0dab93aa4b 100644
--- a/OracleDatabase/SingleInstance/dockerfiles/18.4.0/Dockerfile.xe
+++ b/OracleDatabase/SingleInstance/dockerfiles/18.4.0/Dockerfile.xe
@@ -53,23 +53,28 @@ RUN sync && \
     rm -rf /var/cache/yum && \
     rm -rf /var/tmp/yum-*
 
-USER oracle:oinstall
 
 # Use second ENV so that variable get substituted
 ENV PATH=$ORACLE_HOME/bin:$PATH
 
+USER oracle:oinstall
+
 # Copy binaries
 # -------------
 COPY $CHECK_SPACE_FILE $RUN_FILE $PWD_FILE $CHECK_DB_FILE $CONF_FILE $INSTALL_DIR/
 
+USER root
+
 RUN chmod ug+x $INSTALL_DIR/*.sh && \
-    $INSTALL_DIR/$CHECK_SPACE_FILE && \
-    cd $INSTALL_DIR && \
+    $INSTALL_DIR/$CHECK_SPACE_FILE
+   
+USER oracle:oinstall
+    
+RUN cd $INSTALL_DIR && \
     mkdir -p $ORACLE_BASE/scripts/setup && \
     mkdir $ORACLE_BASE/scripts/startup && \
     ln -s $ORACLE_BASE/scripts /docker-entrypoint-initdb.d && \
     mkdir -p $ORACLE_BASE/oradata /home/oracle && \
-    chown -R oracle:oinstall $ORACLE_BASE /home/oracle && \
     mv $INSTALL_DIR/$RUN_FILE $ORACLE_BASE/ && \
     mv $INSTALL_DIR/$PWD_FILE $ORACLE_BASE/ && \
     mv $INSTALL_DIR/$CHECK_DB_FILE $ORACLE_BASE/ && \

From 586961db4dd9af749c18b73e7d1d439aaf4aa202 Mon Sep 17 00:00:00 2001
From: Jeremy Lundy <16428663+jlundy2@users.noreply.github.com>
Date: Wed, 23 Sep 2020 17:48:48 -0400
Subject: [PATCH 11/15] Update Dockerfile.xe

---
 .../dockerfiles/18.4.0/Dockerfile.xe          | 24 +++++++------------
 1 file changed, 8 insertions(+), 16 deletions(-)

diff --git a/OracleDatabase/SingleInstance/dockerfiles/18.4.0/Dockerfile.xe b/OracleDatabase/SingleInstance/dockerfiles/18.4.0/Dockerfile.xe
index 0dab93aa4b..a9dc5fc6ce 100644
--- a/OracleDatabase/SingleInstance/dockerfiles/18.4.0/Dockerfile.xe
+++ b/OracleDatabase/SingleInstance/dockerfiles/18.4.0/Dockerfile.xe
@@ -47,30 +47,21 @@ ENV ORACLE_BASE=/opt/oracle \
     INSTALL_DIR="$HOME/install" \
     ORACLE_DOCKER_INSTALL="true"
 
-RUN sync && \
-    yum -y install openssl oracle-database-preinstall-18c && \
-    yum -y localinstall $INSTALL_FILE_1 && \
-    rm -rf /var/cache/yum && \
-    rm -rf /var/tmp/yum-*
-
-
 # Use second ENV so that variable get substituted
 ENV PATH=$ORACLE_HOME/bin:$PATH
 
-USER oracle:oinstall
-
 # Copy binaries
 # -------------
 COPY $CHECK_SPACE_FILE $RUN_FILE $PWD_FILE $CHECK_DB_FILE $CONF_FILE $INSTALL_DIR/
 
-USER root
-
 RUN chmod ug+x $INSTALL_DIR/*.sh && \
-    $INSTALL_DIR/$CHECK_SPACE_FILE
-   
-USER oracle:oinstall
-    
-RUN cd $INSTALL_DIR && \
+    sync && \
+    $INSTALL_DIR/$CHECK_SPACE_FILE && \
+    cd $INSTALL_DIR && \
+    yum -y install openssl oracle-database-preinstall-18c && \
+    yum -y localinstall $INSTALL_FILE_1 && \
+    rm -rf /var/cache/yum && \
+    rm -rf /var/tmp/yum-* && \
     mkdir -p $ORACLE_BASE/scripts/setup && \
     mkdir $ORACLE_BASE/scripts/startup && \
     ln -s $ORACLE_BASE/scripts /docker-entrypoint-initdb.d && \
@@ -79,6 +70,7 @@ RUN cd $INSTALL_DIR && \
     mv $INSTALL_DIR/$PWD_FILE $ORACLE_BASE/ && \
     mv $INSTALL_DIR/$CHECK_DB_FILE $ORACLE_BASE/ && \
     mv $INSTALL_DIR/$CONF_FILE /etc/sysconfig/ && \
+    chown -R oracle:oinstall $ORACLE_BASE /home/oracle && \
     ln -s $ORACLE_BASE/$PWD_FILE / && \
     cd $HOME && \
     rm -rf $INSTALL_DIR && \

From 3993ef185afbd5cb7a7e22afa0e73f9871208260 Mon Sep 17 00:00:00 2001
From: Jeremy Lundy <16428663+jlundy2@users.noreply.github.com>
Date: Wed, 23 Sep 2020 17:49:23 -0400
Subject: [PATCH 12/15] Update Dockerfile.xe

---
 OracleDatabase/SingleInstance/dockerfiles/18.4.0/Dockerfile.xe | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/OracleDatabase/SingleInstance/dockerfiles/18.4.0/Dockerfile.xe b/OracleDatabase/SingleInstance/dockerfiles/18.4.0/Dockerfile.xe
index a9dc5fc6ce..a4902bb9ba 100644
--- a/OracleDatabase/SingleInstance/dockerfiles/18.4.0/Dockerfile.xe
+++ b/OracleDatabase/SingleInstance/dockerfiles/18.4.0/Dockerfile.xe
@@ -75,6 +75,8 @@ RUN chmod ug+x $INSTALL_DIR/*.sh && \
     cd $HOME && \
     rm -rf $INSTALL_DIR && \
     chmod ug+x $ORACLE_BASE/*.sh
+    
+USER oracle:oinstall
 
 VOLUME $ORACLE_BASE/oradata
 

From c03941711feb1fb6421a2f2b885c8f85d6cbb5ee Mon Sep 17 00:00:00 2001
From: Jeremy Lundy <16428663+jlundy2@users.noreply.github.com>
Date: Wed, 23 Sep 2020 17:51:31 -0400
Subject: [PATCH 13/15] Update build-and-push.yml

---
 .github/workflows/build-and-push.yml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.github/workflows/build-and-push.yml b/.github/workflows/build-and-push.yml
index ddc9e06986..8cce28c31e 100644
--- a/.github/workflows/build-and-push.yml
+++ b/.github/workflows/build-and-push.yml
@@ -12,6 +12,8 @@ jobs:
     - uses: actions/checkout@v2
     - name: Build and push Docker images
       run: |
+        docker pull jlundy2/oracle-db:18.4.0-xe
+        docker tag jlundy2/oracle-db:18.4.0-xe oracle/database:18.4.0-xe
         cd OracleDatabase/SingleInstance/dockerfiles
         ./buildDockerImage.sh -v 18.4.0 -x
         docker tag oracle/database:18.4.0-xe jlundy2/oracle-db:18.4.0-xe

From f44f610aef31a17bbca1771708a31a73e23c5b8d Mon Sep 17 00:00:00 2001
From: Jeremy Lundy <16428663+jlundy2@users.noreply.github.com>
Date: Wed, 23 Sep 2020 18:23:47 -0400
Subject: [PATCH 14/15] Update Dockerfile.xe

---
 OracleDatabase/SingleInstance/dockerfiles/18.4.0/Dockerfile.xe | 2 --
 1 file changed, 2 deletions(-)

diff --git a/OracleDatabase/SingleInstance/dockerfiles/18.4.0/Dockerfile.xe b/OracleDatabase/SingleInstance/dockerfiles/18.4.0/Dockerfile.xe
index a4902bb9ba..a9dc5fc6ce 100644
--- a/OracleDatabase/SingleInstance/dockerfiles/18.4.0/Dockerfile.xe
+++ b/OracleDatabase/SingleInstance/dockerfiles/18.4.0/Dockerfile.xe
@@ -75,8 +75,6 @@ RUN chmod ug+x $INSTALL_DIR/*.sh && \
     cd $HOME && \
     rm -rf $INSTALL_DIR && \
     chmod ug+x $ORACLE_BASE/*.sh
-    
-USER oracle:oinstall
 
 VOLUME $ORACLE_BASE/oradata
 

From 3a489d4dde427490d246ef860da27c54c56fa1db Mon Sep 17 00:00:00 2001
From: Jeremy Lundy <16428663+jlundy2@users.noreply.github.com>
Date: Thu, 24 Sep 2020 10:06:05 -0400
Subject: [PATCH 15/15] Update Dockerfile.xe

---
 OracleDatabase/SingleInstance/dockerfiles/18.4.0/Dockerfile.xe | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/OracleDatabase/SingleInstance/dockerfiles/18.4.0/Dockerfile.xe b/OracleDatabase/SingleInstance/dockerfiles/18.4.0/Dockerfile.xe
index a9dc5fc6ce..5420b313b3 100644
--- a/OracleDatabase/SingleInstance/dockerfiles/18.4.0/Dockerfile.xe
+++ b/OracleDatabase/SingleInstance/dockerfiles/18.4.0/Dockerfile.xe
@@ -78,7 +78,7 @@ RUN chmod ug+x $INSTALL_DIR/*.sh && \
 
 VOLUME $ORACLE_BASE/oradata
 
-HEALTHCHECK --interval=1m --start-period=5m \
+HEALTHCHECK --interval=1m --start-period=15m \
    CMD "$ORACLE_BASE/$CHECK_DB_FILE" >/dev/null || exit 1
 
 CMD exec $ORACLE_BASE/$RUN_FILE