feat(ci): update ci scripts

.env

 # Define default environment variables, same for dev and prod
 BITRIX_PORT=8081
 SITE_PORT=8080
+HOME=/home/bitrix

.gitignore

@@ -17,6 +17,7 @@ bower_components
 *.vi
 *~
 *.lock
+!www/yarn.lock
 
 # OS or Editor folders
 .DS_Store

docker-compose.prod.yml

@@ -7,7 +7,8 @@ services:
       - upload:/home/bitrix/www/upload:Z
       - data:/var/lib/mysql:Z
 
-      - ./docker/zk-entrypoint.sh:/zk-entrypoint.sh:Z
+      - ./docker/server-setup.sh:/server-setup.sh:Z
+      - ./docker/permissions.sh:/permissions.sh:Z
       - ./docker/link_bx.sh:/link_bx.sh:Z
       - ./docker/build.sh:/build.sh:Z
 
@@ -23,9 +24,12 @@ services:
       - "${SITE_PORT}:80"
       - "22"
     environment:
-      - HOME=/home/bitrix
+      - USER_ID
+      - GROUP_ID
+      - HOME
     env_file: ./prod.env
-    command: /bin/bash /zk-entrypoint.sh
+    command: /bin/bash
+    user: bitrix
     working_dir: /home/bitrix
     tty: true
 

docker-compose.staging.yml

@@ -7,7 +7,8 @@ services:
       - upload:/home/bitrix/www/upload:Z
       - data:/var/lib/mysql:Z
 
-      - ./docker/zk-entrypoint.sh:/zk-entrypoint.sh:Z
+      - ./docker/server-setup.sh:/server-setup.sh:Z
+      - ./docker/permissions.sh:/permissions.sh:Z
       - ./docker/link_bx.sh:/link_bx.sh:Z
       - ./docker/build.sh:/build.sh:Z
 
@@ -23,9 +24,12 @@ services:
       - "${SITE_PORT}:80"
       - "22"
     environment:
-      - HOME=/home/bitrix
+      - USER_ID
+      - GROUP_ID
+      - HOME
     env_file: ./staging.env
-    command: /bin/bash /zk-entrypoint.sh
+    command: /bin/bash
+    user: bitrix
     working_dir: /home/bitrix
     tty: true
 

docker-compose.yml

@@ -7,7 +7,8 @@ services:
       - upload:/home/bitrix/www/upload:Z
       - data:/var/lib/mysql:Z
 
-      - ./docker/zk-entrypoint.sh:/zk-entrypoint.sh:Z
+      - ./docker/server-setup.sh:/server-setup.sh:Z
+      - ./docker/permissions.sh:/permissions.sh:Z
       - ./docker/link_bx.sh:/link_bx.sh:Z
       - ./docker/build.sh:/build.sh:Z
 
@@ -23,9 +24,12 @@ services:
       - "${SITE_PORT}:80"
       - "22"
     environment:
-      - HOME=/home/bitrix
+      - USER_ID
+      - GROUP_ID
+      - HOME
     env_file: ./dev.env
-    command: /bin/bash /zk-entrypoint.sh
+    command: /bin/bash
+    user: bitrix
     working_dir: /home/bitrix
     tty: true
 

docker/build.sh

@@ -11,8 +11,5 @@
 # 		# Build and migrations
 # 		gulp \
 # 		&& php migrator migrate
-# 	) && (
-# 		# Set permissions
-# 		chown -R bitrix.bitrix /home/bitrix/site
 # 	)
 # )

docker/link_bx.sh

@@ -3,6 +3,10 @@
 DEST="$1"
 DEV="$2"
 
+if [ "$ENVIRONMENT" == "development" ]; then
+	DEV="1"
+fi
+
 if [ "$DEV" == "1" ]; then
 	cp -r /home/bitrix/www/bitrix $DEST
 	cp -r /home/bitrix/www/upload $DEST

docker/zk-entrypoint.sh → docker/permissions.sh

-#!/bin/bash
+#!/usr/bin/env bash
 
-# Modify bitrix user id and group id
+# Modify user id and group id
 if [ ! -z "$USER_ID" ]; then
-	usermod -u $USER_ID bitrix
+	usermod -u $USER_ID node
 fi
 
 if [ ! -z "$GROUP_ID" ]; then
-	groupmod -g $GROUP_ID bitrix
+	groupmod -g $GROUP_ID node
 fi
 
-# Set permissions if user changed
+# Set permissions
 if [ ! -z "$USER_ID" ] && [ ! -z "$GROUP_ID" ]; then
-	chown -R bitrix.bitrix /home/bitrix
+	chown -R node.node /home/node
 fi
-
-# Start server
-/bin/bash /run.sh

docker/server-setup.sh

+#!/bin/bash
+
+# Enable php extensions here
+#mv /etc/php.d/20-curl.ini.disabled /etc/php.d/20-curl.ini
+
+# Restart services
+service nginx restart
+service mysqld restart
+service httpd restart
+service sshd restart
+service exim restart

gitlab-ci.yml

@@ -3,9 +3,6 @@ stages:
   - build
   - deploy
 
-variables:
-  BUILD_PATH: "www/dist"
-
 status:
   stage: startup
   script:
@@ -15,18 +12,10 @@ status:
   only:
     - master
 
-docker:
-  stage: startup
-  script:
-    - /bin/bash start.sh
-  only:
-    - master
-
 staging:
   stage: build
   script:
-    - docker-compose exec -T bitrix /bin/bash /link_bx.sh /home/bitrix/site
-    - docker-compose exec -T bitrix /bin/bash /build.sh
+    - /bin/bash start.sh docker-compose.staging.yml
   cache:
     paths:
       - www/node_modules/
@@ -34,10 +23,6 @@ staging:
   environment:
     name: staging
     url: "http://staging.1.dev.1119.zolotoykod.ru"
-  artifacts:
-    paths:
-      - $BUILD_PATH
-    expire_in: 1 day
   only:
     - master
 

start.sh

 #!/bin/bash
 export USER_ID="$(id -u `whoami`)"
 export GROUP_ID="$(id -g `whoami`)"
-docker-compose -f docker-compose.staging.yml up -d
+CONF_FILE="$1"
+
+# start docker net for project
+if [ ! -z "$CONF_FILE" ]; then
+	docker-compose -f ${CONF_FILE} up -d
+else
+	docker-compose up -d
+fi
+
+docker-compose exec --user root -T bitrix /bin/bash /permissions.sh
+docker-compose exec --user root -T bitrix /bin/bash /server-setup.sh
+docker-compose exec -T bitrix /bin/bash /link_bx.sh
+docker-compose exec -T bitrix /bin/bash /build.sh