diff options
| -rw-r--r-- | Applications/phpmyadmin/docker-compose.yml | 4 | ||||
| -rw-r--r-- | docker-compose-app.yml | 5 | ||||
| -rwxr-xr-x | run-tests.sh | 13 |
3 files changed, 13 insertions, 9 deletions
diff --git a/Applications/phpmyadmin/docker-compose.yml b/Applications/phpmyadmin/docker-compose.yml index 0610ee1..0eb2b59 100644 --- a/Applications/phpmyadmin/docker-compose.yml +++ b/Applications/phpmyadmin/docker-compose.yml @@ -14,5 +14,5 @@ application: CONTAINER_INSTANCE: "application-phpmyadmin" SERVER_NAME: "localhost" volumes: - - "/tmp/container/logs/phpmyadmin:/logs/apache" - - "/tmp/container/phpmyadmin:/data/apache"
\ No newline at end of file + - "/tmp/container/logs/phpmyadmin:/logs" + - "/tmp/container/phpmyadmin:/data"
\ No newline at end of file diff --git a/docker-compose-app.yml b/docker-compose-app.yml index c4eba2a..cbb4b25 100644 --- a/docker-compose-app.yml +++ b/docker-compose-app.yml @@ -1,6 +1,7 @@ fedora_app_pma: - build: Applications/phpmyadmin/ - container_name: "application-phpmyadmin" + extends: + file: Applications/phpmyadmin/docker-compose.yml + service: application #fedora_app_rockmongo: # build: Applications/rockmongo/ diff --git a/run-tests.sh b/run-tests.sh index af60fe6..12f6e56 100755 --- a/run-tests.sh +++ b/run-tests.sh @@ -5,15 +5,18 @@ set -ev mkdir /tmp/startx-docker-images; cd /tmp/startx-docker-images; git clone https://github.com/startxfr/docker-images.git . -echo "========> TESTING OS Container (latest)" +echo "========> BUILDING OS Container (latest)" sudo docker-compose -f docker-compose-os.yml build +echo "========> BUILDING SERVICES Containers (latest)" +sudo docker-compose -f docker-compose-sv.yml build +echo "========> BUILDING APPLICATIONS Containers (latest)" +sudo docker-compose -f docker-compose-app.yml build +echo "========> TESTING OS Container (latest)" sudo docker-compose -f docker-compose-os.yml up -d echo "========> TESTING SERVICES Containers (latest)" -sudo docker-compose -f docker-compose-sv.yml build sudo docker-compose -f docker-compose-sv.yml up -d -#echo "========> TESTING APPLICATIONS Containers (latest)" -#sudo docker-compose -f docker-compose-app.yml build -#sudo docker-compose -f docker-compose-app.yml up -d +echo "========> TESTING APPLICATIONS Containers (latest)" +sudo docker-compose -f docker-compose-app.yml up -d echo "=================> TEST ENDED SUCCESSFULLY" exit 0; |