diff options
Diffstat (limited to 'docker')
| -rw-r--r-- | docker/Dockerfile | 26 | ||||
| -rwxr-xr-x | docker/build_image.sh | 2 | ||||
| -rw-r--r-- | docker/docker-env-config.sh | 44 | ||||
| -rwxr-xr-x | docker/instance_run.sh | 2 |
4 files changed, 50 insertions, 24 deletions
diff --git a/docker/Dockerfile b/docker/Dockerfile index bbf9e32..25391f1 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -6,33 +6,15 @@ ARG HTTPS_PROXY=${HTTPS_PROXY} ENV http_proxy $HTTP_PROXY ENV https_proxy $HTTPS_PROXY -RUN sed -i "s|set compatible|set nocompatible|" /etc/vim/vimrc.tiny -RUN echo "set backspace=2" >> /etc/vim/vimrc.tiny - -RUN echo "mysql-server mysql-server/root_password password root" | debconf-set-selections -RUN echo "mysql-server mysql-server/root_password_again password root" | debconf-set-selections - -RUN apt-get update && \ - apt-get install -y gcc && \ - apt-get install -y libmysqlclient-dev && \ - apt-get install -y redis-server && \ - apt-get install -y mysql-server-5.6 && \ - apt-get install -y mysql-client-5.6 && \ - apt-get install -y wget && \ - apt-get install -y unzip && \ - apt-get install -y build-essential && \ - apt-get install -y libssl-dev && \ - apt-get install -y libffi-dev - -RUN sed -i "s|bind-address.*|# bind-address = 127.0.0.1|" /etc/mysql/my.cnf - -VOLUME /var/lib/mysql - ADD . /service WORKDIR /service +RUN bash docker-env-config.sh +VOLUME /var/lib/mysql + EXPOSE 3306 EXPOSE 6379 +USER onap WORKDIR /service ENTRYPOINT ./docker-entrypoint.sh diff --git a/docker/build_image.sh b/docker/build_image.sh index 52ffee5..bb472cc 100755 --- a/docker/build_image.sh +++ b/docker/build_image.sh @@ -6,7 +6,7 @@ cd ${DOCKER_BUILD_DIR} BUILD_ARGS="--no-cache" ORG="onap" -VERSION="1.3.2" +VERSION="1.3.3" PROJECT="vfc" IMAGE="db" DOCKER_REPOSITORY="nexus3.onap.org:10003" diff --git a/docker/docker-env-config.sh b/docker/docker-env-config.sh new file mode 100644 index 0000000..eccdd9e --- /dev/null +++ b/docker/docker-env-config.sh @@ -0,0 +1,44 @@ +#!/bin/bash + +add_user(){ + + useradd onap + chown onap:onap -R /service +} + +install_sf(){ + + sed -i "s|set compatible|set nocompatible|" /etc/vim/vimrc.tiny + echo "set backspace=2" >> /etc/vim/vimrc.tiny + + echo "mysql-server mysql-server/root_password password root" | debconf-set-selections + echo "mysql-server mysql-server/root_password_again password root" | debconf-set-selections + + apt-get update + apt-get install -y gcc libmysqlclient-dev redis-server mysql-server-5.6 mysql-client-5.6 wget unzip build-essential libssl-dev libffi-dev + sed -i "s|bind-address.*|# bind-address = 127.0.0.1|" /etc/mysql/my.cnf + mysql_install_db --user=onap --datadir=/var/lib/mysql + chown -R onap:onap /usr/include/mysql + chown -R onap:onap /usr/share/mysql + chown -R onap:onap /usr/lib/perl5/auto/DBD/mysql + chown -R onap:onap /usr/lib/perl5/DBD/mysql + chown -R onap:onap /usr/bin/mysql + chown -R onap:onap /var/lib/mysql + chown -R onap:onap /var/log/mysql + chown -R onap:onap /etc/init.d/mysql + chown -R onap:onap /etc/mysql + chown -R onap:onap /var/run/mysqld/ + +} + +clean_sf_cache(){ + + apt-get clean + apt-get autoclean + apt-get autoremove +} + +add_user +install_sf +wait +clean_sf_cache diff --git a/docker/instance_run.sh b/docker/instance_run.sh index f72a451..6338e9d 100755 --- a/docker/instance_run.sh +++ b/docker/instance_run.sh @@ -5,7 +5,7 @@ function start_redis_server { } function start_mysql { - service mysql start + /usr/bin/mysqld_safe & sleep 1 } |