Adapt directory structure to docker/util

The container is now built directly from the root directory. Even the simplest composition was moved to demo/plain.
ethan · Sep 27, 2018 · 55fcd70f1d9c48cfa9e61bb996da5acd97bdd933 · 55fcd70
1 parent ce27088
commit 55fcd70f1d9c48cfa9e61bb996da5acd97bdd933
diff --git a/midpoint/midpoint-server/Dockerfile → Dockerfile b/midpoint/midpoint-server/Dockerfile → Dockerfile
diff --git a/Jenkinsfile b/Jenkinsfile
@@ -6,49 +6,36 @@ pipeline {
         tag = 'l'
     }
     stages {
-        stage('Setting build context') {
+        stage ('Setting build context') {
             steps {
                 script {
                     maintainer = maintain()
                     imagename = imagename()
-                    if(env.BRANCH_NAME == "master" || env.BRANCH_NAME == "bats") {		// temporary
+                    if (env.BRANCH_NAME == "master" || env.BRANCH_NAME == "bats") {		// temporary
                        tag = "latest"
                     } else {
                        tag = env.BRANCH_NAME
                     }
-                    if(!imagename){
+                    if (!imagename) {
                         echo "You must define imagename in common.bash"
                         currentBuild.result = 'FAILURE'
-                     }
+                    }
                     sh 'mkdir -p bin'
                     sh 'mkdir -p tmp'
-                    dir('tmp') {
-                      git([ url: "https://github.internet2.edu/docker/util.git", credentialsId: "jenkins-github-access-token" ])
-                      sh 'ls'
-                      sh 'mv bin/* ../bin/.'
+                    dir ('tmp') {
+                        git([ url: "https://github.internet2.edu/docker/util.git", credentialsId: "jenkins-github-access-token" ])
+                        sh 'ls'
+                        sh 'mv bin/* ../bin/.'
                     }
                 }  
-             }
-        }    
-        stage ('Clean') {
-            steps {
-                script {
-                    try {
-                        sh 'bin/destroy.sh >> debug'
-                    } catch (error) {
-                        def error_details = readFile('./debug');
-                        def message = "BUILD ERROR: There was a problem building the Base Image. \n\n ${error_details}"
-                        sh "rm -f ./debug"
-                        handleError(message)
-                    }
-                }
             }
-        } 
+        }    
         stage ('Build') {
             steps {
                 script {
                     try {
-                        sh '(set -e ; cd midpoint ; ./download-midpoint ; ../bin/build.sh) &> debug'
+                        sh './download-midpoint &> debug'
+                        sh 'bin/rebuild.sh &>> debug'
                     } catch (error) {
                         def error_details = readFile('./debug')
                         def message = "BUILD ERROR: There was a problem building ${imagename}:${tag}. \n\n ${error_details}"
@@ -62,16 +49,17 @@ pipeline {
             steps {
                 script {
                     try {
-                        sh 'bats midpoint/tests &> debug'
+                        sh 'bin/test.sh &> debug'
                     } catch (error) {
                         def error_details = readFile('./debug')
-                        def message = "BUILD ERROR: There was a problem building ${imagename}:${tag}. \n\n ${error_details}"
+                        def message = "BUILD ERROR: There was a problem testing ${imagename}:${tag}. \n\n ${error_details}"
                         sh "rm -f ./debug"
                         handleError(message)
                     }
                 }
             }
         }
+/*
         stage ('Test2') {
             steps {
                 script {
@@ -91,10 +79,11 @@ pipeline {
                 }
             }
         }
+*/
         stage ('Push') {
             steps {
                 script {
-                    docker.withRegistry('https://registry.hub.docker.com/',   "dockerhub-$maintainer") {
+                    docker.withRegistry('https://registry.hub.docker.com/', "dockerhub-$maintainer") {
                         def baseImg = docker.build("$maintainer/$imagename")
                         baseImg.push("$tag")
                     }

diff --git a/...es/httpd/conf/midpoint.conf.auth.internal → ...es/httpd/conf/midpoint.conf.auth.internal b/...es/httpd/conf/midpoint.conf.auth.internal → ...es/httpd/conf/midpoint.conf.auth.internal
diff --git a/.../httpd/conf/midpoint.conf.auth.shibboleth → .../httpd/conf/midpoint.conf.auth.shibboleth b/.../httpd/conf/midpoint.conf.auth.shibboleth → .../httpd/conf/midpoint.conf.auth.shibboleth
diff --git a/...ontainer_files/httpd/conf/ssl-enable.conf → container_files/httpd/conf/ssl-enable.conf b/...ontainer_files/httpd/conf/ssl-enable.conf → container_files/httpd/conf/ssl-enable.conf
diff --git a/...ainer_files/mp-dir/active-spring-profiles → ...ainer_files/mp-dir/active-spring-profiles b/...ainer_files/mp-dir/active-spring-profiles → ...ainer_files/mp-dir/active-spring-profiles
diff --git a/...ver/container_files/mp-dir/repository-url → container_files/mp-dir/repository-url b/...ver/container_files/mp-dir/repository-url → container_files/mp-dir/repository-url
diff --git a/...server/container_files/opt-tier/setenv.sh → container_files/opt-tier/setenv.sh b/...server/container_files/opt-tier/setenv.sh → container_files/opt-tier/setenv.sh
diff --git a/...tainer_files/shibboleth/attribute-map.xml → container_files/shibboleth/attribute-map.xml b/...tainer_files/shibboleth/attribute-map.xml → container_files/shibboleth/attribute-map.xml
diff --git a/.../container_files/shibboleth/native.logger → container_files/shibboleth/native.logger b/.../container_files/shibboleth/native.logger → container_files/shibboleth/native.logger
diff --git a/...r/container_files/shibboleth/shibd.logger → container_files/shibboleth/shibd.logger b/...r/container_files/shibboleth/shibd.logger → container_files/shibboleth/shibd.logger
diff --git a/...ntainer_files/supervisor/supervisord.conf → container_files/supervisor/supervisord.conf b/...ntainer_files/supervisor/supervisord.conf → container_files/supervisor/supervisord.conf
diff --git a/...tainer_files/usr-local-bin/healthcheck.sh → container_files/usr-local-bin/healthcheck.sh b/...tainer_files/usr-local-bin/healthcheck.sh → container_files/usr-local-bin/healthcheck.sh
diff --git a/...ner_files/usr-local-bin/sendtierbeacon.sh → ...ner_files/usr-local-bin/sendtierbeacon.sh b/...ner_files/usr-local-bin/sendtierbeacon.sh → ...ner_files/usr-local-bin/sendtierbeacon.sh
diff --git a/...ntainer_files/usr-local-bin/setup-cron.sh → container_files/usr-local-bin/setup-cron.sh b/...ntainer_files/usr-local-bin/setup-cron.sh → container_files/usr-local-bin/setup-cron.sh
diff --git a/...tainer_files/usr-local-bin/start-httpd.sh → container_files/usr-local-bin/start-httpd.sh b/...tainer_files/usr-local-bin/start-httpd.sh → container_files/usr-local-bin/start-httpd.sh
diff --git a/...ner_files/usr-local-bin/start-midpoint.sh → ...ner_files/usr-local-bin/start-midpoint.sh b/...ner_files/usr-local-bin/start-midpoint.sh → ...ner_files/usr-local-bin/start-midpoint.sh
diff --git a/.../container_files/usr-local-bin/startup.sh → container_files/usr-local-bin/startup.sh b/.../container_files/usr-local-bin/startup.sh → container_files/usr-local-bin/startup.sh
diff --git a/midpoint/.env → demo/plain/.env b/midpoint/.env → demo/plain/.env
diff --git a/...idpoint/application/database_password.txt → ...idpoint/application/database_password.txt b/...idpoint/application/database_password.txt → ...idpoint/application/database_password.txt
diff --git a/...idpoint/application/keystore_password.txt → ...idpoint/application/keystore_password.txt b/...idpoint/application/keystore_password.txt → ...idpoint/application/keystore_password.txt
diff --git a/...-and-secrets/midpoint/httpd/host-cert.pem → ...-and-secrets/midpoint/httpd/host-cert.pem b/...-and-secrets/midpoint/httpd/host-cert.pem → ...-and-secrets/midpoint/httpd/host-cert.pem
diff --git a/...s-and-secrets/midpoint/httpd/host-key.pem → ...s-and-secrets/midpoint/httpd/host-key.pem b/...s-and-secrets/midpoint/httpd/host-key.pem → ...s-and-secrets/midpoint/httpd/host-key.pem
diff --git a/...rets/midpoint/shibboleth/idp-metadata.xml → ...rets/midpoint/shibboleth/idp-metadata.xml b/...rets/midpoint/shibboleth/idp-metadata.xml → ...rets/midpoint/shibboleth/idp-metadata.xml
diff --git a/...crets/midpoint/shibboleth/shibboleth2.xml → ...crets/midpoint/shibboleth/shibboleth2.xml b/...crets/midpoint/shibboleth/shibboleth2.xml → ...crets/midpoint/shibboleth/shibboleth2.xml
diff --git a/...d-secrets/midpoint/shibboleth/sp-cert.pem → ...d-secrets/midpoint/shibboleth/sp-cert.pem b/...d-secrets/midpoint/shibboleth/sp-cert.pem → ...d-secrets/midpoint/shibboleth/sp-cert.pem
diff --git a/...nd-secrets/midpoint/shibboleth/sp-key.pem → ...nd-secrets/midpoint/shibboleth/sp-key.pem b/...nd-secrets/midpoint/shibboleth/sp-key.pem → ...nd-secrets/midpoint/shibboleth/sp-key.pem
diff --git a/midpoint/docker-compose.yml → demo/plain/docker-compose.yml b/midpoint/docker-compose.yml → demo/plain/docker-compose.yml
@@ -14,7 +14,7 @@ services:
      - CREATE_NEW_DATABASE=if_needed
 
   midpoint-server:
-    build: ./midpoint-server/
+    image: tier/midpoint:latest
     ports:
       - 8443:443
     environment:

diff --git a/midpoint/download-midpoint → download-midpoint b/midpoint/download-midpoint → download-midpoint
@@ -3,10 +3,10 @@
 dir=`dirname "$0"`
 echo "Downloading midPoint 3.9-SNAPSHOT"
 echo "-----------------------------------------"
-curl --output $dir/midpoint-server/midpoint-3.9-SNAPSHOT-dist.tar.gz "https://evolveum.com/downloads/midpoint-tier/midpoint-3.9-SNAPSHOT-dist.tar.gz"
+curl --output $dir/midpoint-3.9-SNAPSHOT-dist.tar.gz "https://evolveum.com/downloads/midpoint-tier/midpoint-3.9-SNAPSHOT-dist.tar.gz"
 echo "-----------------------------------------"
 echo "Checking the download..."
-if tar -tf $dir/midpoint-server/midpoint-3.9-SNAPSHOT-dist.tar.gz >/dev/null; then
+if tar -tf $dir/midpoint-3.9-SNAPSHOT-dist.tar.gz >/dev/null; then
   echo "OK"
 else
   echo "The file was not downloaded correctly"

diff --git a/midpoint/README.md → midpoint-obsolete/README.md b/midpoint/README.md → midpoint-obsolete/README.md
diff --git a/midpoint/build.sh → midpoint-obsolete/build.sh b/midpoint/build.sh → midpoint-obsolete/build.sh
diff --git a/midpoint/cleanup.sh → midpoint-obsolete/cleanup.sh b/midpoint/cleanup.sh → midpoint-obsolete/cleanup.sh
diff --git a/midpoint/test.sh → midpoint-obsolete/test.sh b/midpoint/test.sh → midpoint-obsolete/test.sh
diff --git a/midpoint/test/t010-wait-for-start.sh → ...oint-obsolete/test/t010-wait-for-start.sh b/midpoint/test/t010-wait-for-start.sh → ...oint-obsolete/test/t010-wait-for-start.sh
diff --git a/midpoint/test/t100-check-health.sh → midpoint-obsolete/test/t100-check-health.sh b/midpoint/test/t100-check-health.sh → midpoint-obsolete/test/t100-check-health.sh
diff --git a/midpoint/test/t110-get-administrator.sh → ...t-obsolete/test/t110-get-administrator.sh b/midpoint/test/t110-get-administrator.sh → ...t-obsolete/test/t110-get-administrator.sh
diff --git a/midpoint/test/t120-add-get-user.sh → midpoint-obsolete/test/t120-add-get-user.sh b/midpoint/test/t120-add-get-user.sh → midpoint-obsolete/test/t120-add-get-user.sh
diff --git a/midpoint/test/t200-stop-start.sh → midpoint-obsolete/test/t200-stop-start.sh b/midpoint/test/t200-stop-start.sh → midpoint-obsolete/test/t200-stop-start.sh
diff --git a/...oint/test/t300-repository-preservation.sh → ...lete/test/t300-repository-preservation.sh b/...oint/test/t300-repository-preservation.sh → ...lete/test/t300-repository-preservation.sh
diff --git a/midpoint/tests/main.bats → tests/main.bats b/midpoint/tests/main.bats → tests/main.bats