Use new approach

ome · Feb 5, 2018 · fdbd628 · fdbd628
1 parent a01beeb
commit fdbd628
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 139 deletions.
diff --git a/app-docker b/app-docker
@@ -1,50 +1,2 @@
 #!/bin/bash
-
-# assumes:
-# git clone --recurse-submodules git://github.com/openmicroscopy/omero-test-infra .omero
-
-set -e
-set -u
-
-DIR=${DIR:-.}
-PROJECT=${PROJECT:-omero}
-CID=${CID:-"$PROJECT"_web_1}
-TARGET=/$(basename $PWD)
-.omero/compose up -d --force-recreate
-docker cp -L .      $CID:/$TARGET
-docker cp -L .omero $CID:/infra
-docker exec -u root -e TARGET=$TARGET $CID sh -c "chown -R omero-web:omero-web $TARGET /infra"
-
-
-# Workarounds
-# https://github.com/openmicroscopy/omero-web-docker/pull/17
-docker exec $CID sed -i "s/^\(omero\.host\s*=\s*\).*\$/\1omero/" /opt/omero/web/OMERO.web/etc/ice.config
-# Need Java for importing
-docker exec -e USER_AGENT=Travis -u root $CID /opt/omero/omego/bin/omego download java --sym /opt/omero/java
-docker exec $CID ln -s /opt/omero/java/libs /opt/omero/web/OMERO.web/lib/client
-
-# Run custom dependencies setup
-if [ -e .omeroci/app-deps ]; then
-  docker exec -u root $CID bash /$TARGET/.omeroci/app-deps
-fi
-
-docker exec -e OMERO_HOST=omero $CID /infra/wait-on-login
-# install setuptools and requirement
-docker exec -u root -e TARGET=$TARGET $CID /infra/py-common
-if [ -e .omeroci/app-check ]; then
-  docker exec -u root $CID bash /$TARGET/.omeroci/app-check
-else 
-  docker exec -u root -e TARGET=$TARGET $CID /infra/py-check
-fi
-
-docker exec -u root -e TARGET=$TARGET $CID /infra/py-setup
-
-# Run custom server setup
-if [ -e .omeroci/app-config ]; then
-  docker exec $CID bash /$TARGET/.omeroci/app-config
-else
-  NAME=$(echo $(basename $PWD) | tr - _)
-  docker exec -e NAME=$NAME $CID /infra/app-config
-fi
-
-docker exec  -u root -e TARGET=$TARGET -e DIR=$DIR $CID /infra/app-build
+. "$(dirname "$0")"/docker app
diff --git a/cli-docker b/cli-docker
@@ -3,17 +3,4 @@
 # assumes:
 # git clone --recurse-submodules git://github.com/openmicroscopy/omero-test-infra .omero
 
-set -e
-set -u
-
-PROJECT=${PROJECT:-omero}
-CID=${CID:-"$PROJECT"_omero_1}
-TARGET=/$(basename $PWD)
-.omero/compose up -d --force-recreate
-docker cp -L .      $CID:/$TARGET
-docker cp -L .omero $CID:/infra
-docker exec -u root -e TARGET=$TARGET $CID sh -c "chown -R omero-server:omero-server $TARGET /infra"
-
-docker exec $CID /infra/wait-on-login
-docker exec -u root -e TARGET=$TARGET $CID /infra/py-setup
-docker exec         -e TARGET=$TARGET $CID /infra/cli-build
+. "$(dirname "$0")"/docker cli
diff --git a/lib-docker b/lib-docker
@@ -3,35 +3,4 @@
 # assumes:
 # git clone --recurse-submodules git://github.com/openmicroscopy/omero-test-infra .omero
 
-export DOCKER_ARGS=${DOCKER_ARGS:-""}
-
-set -e
-set -u
-set -x
-
-# TODO: Refactor this into a common docker-setup
-PROJECT=${PROJECT:-omero}
-CID=${CID:-"$PROJECT"_omero_1}
-NETWORK=${NETWORK:-"$PROJECT"_default}
-TARGET=/$(basename $PWD)
-.omero/compose up -d --force-recreate
-docker cp -L .      $CID:/$TARGET
-docker cp -L .omero $CID:/infra
-docker exec -u root $CID sh -c "chown -R omero-server:omero-server $TARGET /infra"
-
-# Build the library that should be run on the client-side
-docker build -t test .
-
-# Check that we can login to the server
-docker exec $CID /infra/wait-on-login
-
-# Run custom server setup
-if [ -e .omeroci/test-data ];
-then
-  printf "travis_fold:start:test-data\n"
-  docker exec -ti $CID /$TARGET/.omeroci/test-data
-  printf "travis_fold:end:test-data\n"
-fi
-
-# Run the tests in the library docker
-docker run --link $CID:omero --net $NETWORK --rm $DOCKER_ARGS test
+e. "$(dirname "$0")"/docker lib
diff --git a/scripts-docker b/scripts-docker
@@ -3,47 +3,4 @@
 # assumes:
 # git clone --recurse-submodules git://github.com/openmicroscopy/omero-test-infra .omero
 
-set -e
-set -u
-set -x
-
-PROJECT=${PROJECT:-omero}
-CID=${CID:-"$PROJECT"_omero_1}
-
-TARGET=/$(basename $PWD)
-.omero/compose up -d --force-recreate
-docker cp -L .      $CID:/$TARGET
-docker cp -L .omero $CID:/infra
-docker exec -u root         $CID sh -c "chown -R omero-server:omero-server $TARGET /infra"
-
-# Run custom dependencies setup
-if [ -e .omeroci/scripts-deps ]; then
-  docker exec -u root $CID bash /$TARGET/.omeroci/scripts-deps
-fi
-
-# install setuptools and requirement
-docker exec -u root -e TARGET=$TARGET $CID /infra/py-common
-
-if [ -e .omeroci/scripts-check ]; then
-  docker exec -u root $CID bash /$TARGET/.omeroci/scripts-check
-else 
-  docker exec -u root -e TARGET=$TARGET $CID /infra/py-check
-fi
-
-#docker exec -u root         $CID yum install -y mencoder
-if [ $SET_UP = true ]; then
-  docker exec -u root -e TARGET=$TARGET $CID /infra/py-setup
-fi
-# copy the scripts
-docker exec -u omero-server -e TARGET=$TARGET $CID /infra/scripts-copy
-
-docker exec $CID /infra/wait-on-login
-
-# Run custom server setup
-if [ -e .omeroci/test-data ]; then
-  printf "travis_fold:start:test-data\n"
-  docker exec -ti $CID /$TARGET/.omeroci/test-data
-  printf "travis_fold:end:test-data\n"
-fi
-
-docker exec -u omero-server -e TARGET=$TARGET $CID /infra/scripts-build
+. "$(dirname "$0")"/docker scripts