diff --git a/BuildDocker b/BuildDocker new file mode 100755 index 0000000..7cd3746 --- /dev/null +++ b/BuildDocker @@ -0,0 +1,45 @@ +#!/bin/bash +# rsync script + +git pull origin master + +cd modules +for f in * +do + cd $f && git pull origin master && cd .. +done +cd .. + +npm install + +rm -r /home/administrator/apps/willaengine/public/js/vue + +npm run production + +rm -r /home/administrator/apps/nginx/www/willaengine/public/js/vue +rm -r /home/administrator/apps/nginx/www/willamall/public/js/vue +rm -r /home/administrator/apps/nginx/www/willaarts/public/js/vue + +cp -r /home/administrator/apps/willaengine/public/js/vue /home/administrator/apps/nginx/www/willaengine/public/js/ + +cp -r /home/administrator/apps/willaengine/public/js/vue /home/administrator/apps/nginx/www/willamall/public/js/ + +cp -r /home/administrator/apps/willaengine/public/js/vue /home/administrator/apps/nginx/www/willaarts/public/js/ + +cp /home/administrator/apps/willaengine/public/mix-manifest.json /home/administrator/apps/nginx/www/willaengine/public/ + +cp /home/administrator/apps/willaengine/public/mix-manifest.json /home/administrator/apps/nginx/www/willaarts/public/ + + +sudo chown -R www-data:www-data /home/administrator/apps/nginx/www/willaarts/public + +sudo chown -R www-data:www-data /home/administrator/apps/nginx/www/willamall/public + +sudo chown -R www-data:www-data /home/administrator/apps/nginx/www/willaengine/public + +#if [ !$1 ]; then +# docker-compose up -d --build app +# docker exec willaengine service cron start +#fi + +sudo chown -R www-data:www-data /home/administrator/apps/nginx/www/willaengine diff --git a/Dockerfile b/Dockerfile index d85f136..f987e9a 100644 --- a/Dockerfile +++ b/Dockerfile @@ -7,7 +7,7 @@ RUN docker-php-ext-install gd RUN echo 'memory_limit = -1' >> /usr/local/etc/php/conf.d/docker-php-memlimit.ini; COPY database /var/www/database -COPY composer.* /var/www/ +COPY composer.json /var/www/ RUN composer clearcache && composer update --no-scripts diff --git a/Jenkinsfile b/Jenkinsfile index 18a7749..ef3214c 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -16,11 +16,12 @@ pipeline { stage('deploy') { steps { sh 'cd /home/administrator/apps/$IMAGE_NAME/ ; docker-compose up -d' + sh 'docker exec willaengine service cron start' } } } environment { - IMAGE_NAME = 'karmmania' + IMAGE_NAME = 'willaengine' } -} \ No newline at end of file +} diff --git a/composer.json b/composer.json index 2817a37..b85e75f 100644 --- a/composer.json +++ b/composer.json @@ -26,6 +26,7 @@ "wm/product": "dev-master", "wm/service": "dev-master", "wm/store": "dev-master", + "wm/admin": "dev-master", "zircote/swagger-php": "^3.0" }, "provide": { diff --git a/docker-compose.yml b/docker-compose.yml new file mode 100644 index 0000000..17036cc --- /dev/null +++ b/docker-compose.yml @@ -0,0 +1,40 @@ +version: '2' + +services: + + # The Application + app: + container_name: willaengine + #build: + # context: ./ + image: registry.willaspace.com/willaspace/willaengine + volumes: + - ~/apps/nginx/www/willaengine/storage:/var/www/storage + - ~/apps/nginx/www/willaengine/public:/var/www/public + env_file: '.env.prod' + environment: + - "DB_HOST=mysql_database" + - "REDIS_HOST=cache" + + # The Database + database: + container_name: mysql_database + image: mysql + volumes: + - dbdata:/var/lib/mysql + environment: + - "MYSQL_DATABASE=willaengine" + - "MYSQL_USER=wmuser" + - "MYSQL_PASSWORD=ksgHJujtfYSUYiGJdfuK9w7dstfs" + - "MYSQL_ROOT_PASSWORD=ksgHJujtfYSUYiGJdfuK9w7dstfs" + ports: + - 3306:3306 + # redis + cache: + container_name: cache + image: redis:alpine + +volumes: + dbdata: + +