Add oracle image

Author: builder

Dockerfile-oracle

@@ -0,0 +1,14 @@
+FROM centos/python-35-centos7
+
+# Set a privileged user to install another dependencies
+USER root
+COPY rpms/*.rpm /tmp/
+RUN yum install -y /tmp/*.rpm &&\
+    yum clean all -y
+
+ENV LD_LIBRARY_PATH=/usr/lib/oracle/12.2/client64/lib:$LD_LIBRARY_PATH
+
+RUN rm -rf /tmp/*.rpm
+
+# This default user after all instalation
+USER 1001

Dockerfile-oracle.onbuild

@@ -0,0 +1,23 @@
+FROM centos/python-35-centos7
+
+# Set a privileged user to install another dependencies
+USER root
+COPY rpms/*.rpm /tmp/
+RUN yum install -y /tmp/*.rpm &&\
+    yum clean all -y
+
+ENV LD_LIBRARY_PATH=/usr/lib/oracle/12.2/client64/lib:$LD_LIBRARY_PATH
+
+RUN rm -rf /tmp/*.rpm
+
+ONBUILD ARG GIT_SSL_NO_VERIFY
+ONBUILD COPY requirements.txt /opt/app-root/src
+ONBUILD USER root
+ONBUILD RUN /bin/bash -c "pip install --no-cache-dir -r requirements.txt"
+ONBUILD USER 1001
+ONBUILD COPY . /opt/app-root/src
+
+# This default user after all instalation
+USER 1001
+
+CMD $STI_SCRIPTS_PATH/run

Makefile

@@ -4,12 +4,26 @@ IMAGE_NAME = python-35-centos7-custom
 build:
 	docker build -t $(IMAGE_NAME) .
 
+.PHONY: test-all
+test-all: test test-onbuild test-oracle test-oracle-onbuild
+	echo "Success"
+
 .PHONY: test
 test:
 	docker build -t $(IMAGE_NAME)-candidate .
-	IMAGE_NAME=$(IMAGE_NAME)-candidate test/run
+	IMAGE_NAME=$(IMAGE_NAME)-candidate test/run test-app
 
 .PHONY: test-onbuild
 test-onbuild:
 	docker build -t $(IMAGE_NAME)-onbuild-candidate -f Dockerfile.onbuild .
-	GIT_SSL_NO_VERIFY=true IMAGE_NAME=$(IMAGE_NAME)-onbuild-candidate test/run-onbuild
+	GIT_SSL_NO_VERIFY=true IMAGE_NAME=$(IMAGE_NAME)-onbuild-candidate test/run-onbuild test-app
+
+.PHONY: test-oracle
+test-oracle:
+	docker build -t $(IMAGE_NAME)-oracle-candidate -f Dockerfile-oracle .
+	IMAGE_NAME=$(IMAGE_NAME)-oracle-candidate test/run test-oracle-app
+
+.PHONY: test-oracle-onbuild
+test-oracle-onbuild:
+	docker build -t $(IMAGE_NAME)-oracle-onbuild-candidate -f Dockerfile-oracle.onbuild .
+	GIT_SSL_NO_VERIFY=true IMAGE_NAME=$(IMAGE_NAME)-oracle-onbuild-candidate test/run-onbuild test-oracle-app

rpms/oracle-instantclient12.2-basic-12.2.0.1.0-1.x86_64.rpm

@@ -1 +1 @@
-.git/
+.git

rpms/oracle-instantclient12.2-devel-12.2.0.1.0-1.x86_64.rpm

@@ -9,6 +9,11 @@
 # IMAGE_NAME specifies a name of the candidate image used for testing.
 # The image has to be available before this script is executed.
 #
+if [ $# -eq 0 ]; then
+  echo "ERROR: No test project name has been passed."
+  exit 1
+fi
+
 IMAGE_NAME=${IMAGE_NAME-python-35-centos7-custom-candidate}
 
 # Determining system utility executables (darwin compatibility check)
@@ -19,6 +24,7 @@ if [[ "$OSTYPE" =~ 'darwin' ]]; then
   ! type -a "gmktemp" &>"/dev/null" || MKTEMP_EXEC="gmktemp"
 fi
 
+test_project=${1}
 test_dir="$($READLINK_EXEC -zf $(dirname "${BASH_SOURCE[0]}"))"
 image_dir=$($READLINK_EXEC -zf ${test_dir}/..)
 scripts_url="file://${image_dir}/.s2i/bin"
@@ -60,7 +66,7 @@ container_port() {
 }
 
 run_s2i_build() {
-  s2i build --incremental=true ${s2i_args} file://${test_dir}/test-app ${IMAGE_NAME} ${IMAGE_NAME}-testapp
+  s2i build --incremental=true ${s2i_args} file://${test_dir}/${test_project} ${IMAGE_NAME} ${IMAGE_NAME}-testapp
 }
 
 prepare() {
@@ -69,7 +75,7 @@ prepare() {
     exit 1
   fi
   # s2i build requires the application is a valid 'Git' repository
-  pushd ${test_dir}/test-app >/dev/null
+  pushd ${test_dir}/${test_project} >/dev/null
   git init
   git config user.email "build@localhost" && git config user.name "builder"
   git add -A && git commit -m "Sample commit"
@@ -90,7 +96,7 @@ cleanup() {
   if image_exists ${IMAGE_NAME}-testapp; then
     docker rmi ${IMAGE_NAME}-testapp
   fi
-  rm -rf ${test_dir}/test-app/.git
+  rm -rf ${test_dir}/${test_project}/.git
 }
 
 check_result() {

test/.gitignore

@@ -9,6 +9,11 @@
 # IMAGE_NAME specifies a name of the candidate image used for testing.
 # The image has to be available before this script is executed.
 #
+if [ $# -eq 0 ]; then
+  echo "ERROR: No test project name has been passed."
+  exit 1
+fi
+
 IMAGE_NAME=${IMAGE_NAME-python-35-centos7-custom-onbuild-candidate}
 
 # Determining system utility executables (darwin compatibility check)
@@ -19,6 +24,7 @@ if [[ "$OSTYPE" =~ 'darwin' ]]; then
   ! type -a "gmktemp" &>"/dev/null" || MKTEMP_EXEC="gmktemp"
 fi
 
+test_project=${1}
 test_dir="$($READLINK_EXEC -zf $(dirname "${BASH_SOURCE[0]}"))"
 image_dir=$($READLINK_EXEC -zf ${test_dir}/..)
 scripts_url="file://${image_dir}/.s2i/bin"
@@ -56,7 +62,7 @@ container_port() {
 }
 
 run_build() {
-  docker build --build-arg "GIT_SSL_NO_VERIFY=$GIT_SSL_NO_VERIFY" -t ${IMAGE_NAME}-testapp ${test_dir}/test-app
+  docker build --build-arg "GIT_SSL_NO_VERIFY=$GIT_SSL_NO_VERIFY" -t ${IMAGE_NAME}-testapp ${test_dir}/${test_project}
 }
 
 prepare() {
@@ -65,7 +71,7 @@ prepare() {
     exit 1
   fi
   # s2i build requires the application is a valid 'Git' repository
-  pushd ${test_dir}/test-app >/dev/null
+  pushd ${test_dir}/${test_project} >/dev/null
   git init
   git config user.email "build@localhost" && git config user.name "builder"
   git add -A && git commit -m "Sample commit"
@@ -85,7 +91,7 @@ cleanup() {
   if image_exists ${IMAGE_NAME}-testapp; then
     docker rmi ${IMAGE_NAME}-testapp
   fi
-  rm -rf ${test_dir}/test-app/.git
+  rm -rf ${test_dir}/${test_project}/.git
 }
 
 check_result() {

test/run

@@ -1,3 +1,3 @@
 cryptography==1.5.2
-Eve==0.7.1
+Eve==0.7.4
 PyYAML==3.12

test/run-onbuild

@@ -0,0 +1,4 @@
+FROM python-35-centos7-custom-oracle-onbuild-candidate
+
+# COPY requirements.txt /tmp
+RUN touch dummy.txt