From 698fd22d3eac43bfbf35ddb7222751c3987b862e Mon Sep 17 00:00:00 2001
From: CycleOfTheAbsurd <alex7up42@gmail.com>
Date: Mon, 13 May 2019 17:26:57 -0400
Subject: [PATCH 1/2] Create Docker Compose file.

---
 README.md          | 40 ++++++++++++++++++++++++++++++++++------
 docker-compose.yml | 20 ++++++++++++++++++++
 2 files changed, 54 insertions(+), 6 deletions(-)
 mode change 100644 => 100755 README.md
 create mode 100755 docker-compose.yml

diff --git a/README.md b/README.md
old mode 100644
new mode 100755
index 6ba9d54..f558951
--- a/README.md
+++ b/README.md
@@ -3,8 +3,10 @@
 <!-- TOC depthFrom:2 -->
 
 - [Prerequisites](#prerequisites)
-- [Build Image](#build-image)
-- [Run Container](#run-container)
+- [Setup with Docker Compose](#setup-with-docker-compose)
+- [Manual Setup](#manual-setup)
+	- [Build Image](#build-image)
+	- [Run Container](#run-container)
 - [Container Commands](#container-commands)
 - [Other](#other)
   - [SQL](#sql)
@@ -20,13 +22,39 @@
 
 ## Prerequisites
 
-1. [Download](https://www.oracle.com/technetwork/database/database-technologies/express-edition/downloads/index.html) the RPM from Oracle Technology Network and save to folder. We will assume it is in `~/Downloads/oracle-database-xe-18c-1.0-1.x86_64.rpm`.
+1. [Download](https://www.oracle.com/technetwork/database/database-technologies/express-edition/downloads/index.html) the RPM from Oracle Technology Network and save to folder. We will assume it is in `~/Downloads/oracle-database-xe-VERSION.rpm`.
 
-1. _Optional:_ Setup docker network: `docker network create oracle_network`. This is useful if you want other containers to connect to your database (ORDS for example). You can change `oracle_network` for any name you want, however this name will be used in all the code snippets below. 
+The following steps are not necessary if you use the [docker-compose setup method](#setup-with-docker-compose):
+
+1. _Optional:_ Setup docker network: `docker network create oracle_network`. This is useful if you want other containers to connect to your database (ORDS for example). You can change `oracle_network` for any name you want, however this name will be used in all the code snippets below.
 
 1. _Optional:_ Create a folder `mkdir ~/docker/oracle-xe` which will store your Oracle XE data to be preserved after the container is destroyed.
 
-## Build Image
+## Setup With Docker Compose
+
+*Note*: Use this setup method or the [manual one](#manual-setup) not both.
+
+```bash
+-- Clone repo
+git clone git@github.com:fuzziebrain/docker-oracle-xe.git
+
+-- Set the working directory to the project folder
+cd docker-oracle-xe
+
+-- Copy the RPMs to docker-odb18c-xe/files
+cp ~/Downloads/oracle-database-xe-*.rpm files/
+-- Build Image
+docker-compose build
+
+-- Run Container
+docker-compose up
+```
+
+## Manual Setup
+
+*Note*: Use this setup method or the [Docker Compose one](#setup-with-docker-compose) not both.
+
+### Build Image
 
 ```bash
 -- Clone repo
@@ -42,7 +70,7 @@ cp ~/Downloads/oracle-database-xe-18c-1.0-1.x86_64.rpm files/
 docker build -t oracle-xe:18c .
 ```
 
-## Run Container
+### Run Container
 
 _Note first time will take a a while to run for as the `oracle-xe configure` script needs to complete_
 
diff --git a/docker-compose.yml b/docker-compose.yml
new file mode 100755
index 0000000..ccf8113
--- /dev/null
+++ b/docker-compose.yml
@@ -0,0 +1,20 @@
+version: "3.7"
+services:
+
+    oracle-xe:
+        build:
+            context: ./
+        image: oracle-xe:18c
+        ports:
+            - "32118:1521"
+            - "35518:5500"
+        volumes:
+            - oracle-xe-volume:/opt/oracle/oradata
+
+
+networks:
+    default:
+        name: "oracle_network"
+
+volumes:
+    oracle-xe-volume: {}

From 315f11b89a6098bca8df33966600a6435fa584d2 Mon Sep 17 00:00:00 2001
From: CycleOfTheAbsurd <alex7up42@gmail.com>
Date: Mon, 13 May 2019 17:29:26 -0400
Subject: [PATCH 2/2] Make setup version independent.

---
 Dockerfile | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)
 mode change 100644 => 100755 Dockerfile

diff --git a/Dockerfile b/Dockerfile
old mode 100644
new mode 100755
index 861e45c..17249a9
--- a/Dockerfile
+++ b/Dockerfile
@@ -15,14 +15,13 @@ ENV \
   SHUTDOWN_FILE=shutdownDb.sh \
   EM_REMOTE_ACCESS=enableEmRemoteAccess.sh \
   EM_RESTORE=reconfigureEm.sh \
-  ORACLE_XE_RPM=oracle-database-xe-18c-1.0-1.x86_64.rpm \
   CHECK_DB_FILE=checkDBStatus.sh
-    
-COPY ./files/${ORACLE_XE_RPM} /tmp/
+
+COPY ./files/ /tmp/
 
 RUN yum install -y oracle-database-preinstall-18c && \
-  yum install -y /tmp/${ORACLE_XE_RPM} && \
-  rm -rf /tmp/${ORACLE_XE_RPM}
+  yum localinstall -y /tmp/oracle-database-xe-18c-*.rpm && \
+  rm -rf /tmp/oracle-*
 
 COPY ./scripts/*.sh ${ORACLE_BASE}/scripts/