diff options
| -rw-r--r-- | OS/Dockerfile | 5 | ||||
| -rw-r--r-- | OS/docker-compose.yml | 8 | ||||
| -rw-r--r-- | OS/run.sh | 4 | ||||
| -rw-r--r-- | OS/sx-lib.sh | 18 | ||||
| -rw-r--r-- | Services/apache/httpd.sh (renamed from Services/apache/sx/httpd.sh) | 0 | ||||
| -rw-r--r-- | Services/apache/index.html (renamed from Services/apache/html/index.html) | 0 | ||||
| -rw-r--r-- | Services/apache/run.sh (renamed from Services/apache/sx/httpd_run.sh) | 0 | ||||
| -rw-r--r-- | docker-compose.yml | 20 | ||||
| -rwxr-xr-x | run-tests.sh | 5 |
9 files changed, 43 insertions, 17 deletions
diff --git a/OS/Dockerfile b/OS/Dockerfile index ce00afb..878005c 100644 --- a/OS/Dockerfile +++ b/OS/Dockerfile @@ -7,4 +7,7 @@ RUN dnf -y install deltarpm pwgen tar python-dnf-plugins-extras-migrate && \ dnf-2 migrate && \ dnf -y install psmisc coreutils findutils wget logrotate && \ dnf clean all -RUN mkdir -p /sx +COPY *.sh /bin/ +RUN chmod 775 /bin/sx-lib.sh /bin/run.sh + +CMD ["/bin/run.sh"] diff --git a/OS/docker-compose.yml b/OS/docker-compose.yml index 65ce1f3..c79d5d9 100644 --- a/OS/docker-compose.yml +++ b/OS/docker-compose.yml @@ -4,5 +4,9 @@ server: container_name: "sx-fedora" mem_limit: 1g memswap_limit: 2g - cpu_shares: 4096 - restart: "on-failure:2"
\ No newline at end of file + cpu_shares: 2 + restart: "on-failure:2" + environment: + CONTAINER_SERVICE: "os" + CONTAINER_TYPE: "fedora" + CONTAINER_INSTANCE: "sx-fedora"
\ No newline at end of file diff --git a/OS/run.sh b/OS/run.sh new file mode 100644 index 0000000..ca12432 --- /dev/null +++ b/OS/run.sh @@ -0,0 +1,4 @@ +#!/bin/bash +source /bin/sx-lib.sh + +display_container_header
\ No newline at end of file diff --git a/OS/sx-lib.sh b/OS/sx-lib.sh new file mode 100644 index 0000000..2fcb5aa --- /dev/null +++ b/OS/sx-lib.sh @@ -0,0 +1,18 @@ +#!/bin/bash + +export TERM=dumb + +function display_container_header { + echo "+=====================================================" + echo "| Container : $HOSTNAME" + if [ -v CONTAINER_TYPE ]; then + echo "| Type : $CONTAINER_TYPE" + fi + if [ -v CONTAINER_INSTANCE ]; then + echo "| Instance : $CONTAINER_INSTANCE" + fi + if [ -v CONTAINER_SERVICE ]; then + echo "| Service : $CONTAINER_SERVICE" + fi + echo "+=====================================================" +} diff --git a/Services/apache/sx/httpd.sh b/Services/apache/httpd.sh index 0220984..0220984 100644 --- a/Services/apache/sx/httpd.sh +++ b/Services/apache/httpd.sh diff --git a/Services/apache/html/index.html b/Services/apache/index.html index 9c72bb2..9c72bb2 100644 --- a/Services/apache/html/index.html +++ b/Services/apache/index.html diff --git a/Services/apache/sx/httpd_run.sh b/Services/apache/run.sh index ef073a3..ef073a3 100644 --- a/Services/apache/sx/httpd_run.sh +++ b/Services/apache/run.sh diff --git a/docker-compose.yml b/docker-compose.yml index d97b2e8..0156a71 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -3,9 +3,9 @@ fedora: container_name: "startx-fedora" command: cat /etc/redhat-release -apache: - build: Services/apache/ - container_name: "startx-sv-apache" +#apache: +# build: Services/apache/ +# container_name: "startx-sv-apache" #mariadb: # build: Services/mariadb/ @@ -19,18 +19,18 @@ apache: # build: Services/mongo/ # container_name: "startx-sv-mongo" -nodejs: - build: Services/nodejs/ - container_name: "startx-sv-nodejs" - command: node /app/app.js +#nodejs: +# build: Services/nodejs/ +# container_name: "startx-sv-nodejs" +# command: node /app/app.js #ooconv: # build: Services/ooconv/ # container_name: "startx-sv-ooconv" -php: - build: Services/php/ - container_name: "startx-sv-php" +#php: +# build: Services/php/ +# container_name: "startx-sv-php" #postgres: # build: Services/postgres/ diff --git a/run-tests.sh b/run-tests.sh index 0b7cade..b81f952 100755 --- a/run-tests.sh +++ b/run-tests.sh @@ -6,7 +6,4 @@ git clone https://github.com/startxfr/docker-images.git /tmp/startx-docker-image sudo docker-compose build sudo docker-compose up -d sudo docker-compose logs -echo $TRAVIS_PULL_REQUEST -if [ "${TRAVIS_PULL_REQUEST}" = "false" ]; then - exit 0; -fi
\ No newline at end of file +exit 0;
\ No newline at end of file |