Merge pull request #52 from nuxsmin/3.2

v3.2.2
nuxsmin · Mar 13, 2021 · 7ab583e · 7ab583e
2 parents d91f603 + 58d1a08
commit 7ab583e
Show file tree

Hide file tree

Showing 12 changed files with 52 additions and 30 deletions.
diff --git a/Makefile b/Makefile
@@ -1,5 +1,5 @@
-VERSION=3.2.1
-BUILD_NUMBER=21011601
+VERSION=3.2.2
+BUILD_NUMBER=21031301
 
 build_vendor:
 	cd build \

diff --git a/common/common_fn.sh b/common/common_fn.sh
@@ -6,7 +6,7 @@
 : ${COMPOSER_EXTENSIONS:=}
 : ${DEBUG:=0}
 
-if [ ${DEBUG} -eq 1 ]; then
+if [ ${DEBUG} -eq 1 -o ${SYSPASS_DEV} -eq 1 ]; then
   set -x
 fi
 
@@ -29,6 +29,11 @@ setup_apache () {
 
   echo -e "${COLOR_YELLOW}setup_apache: Setting up xdebug variables${COLOR_NC}"
 
+  if [ ! -e ${PHP_XDEBUG_FILE} ]; then
+    echo -e "${COLOR_RED}setup_apache: Xdebug's file not found (${PHP_XDEBUG_FILE})${COLOR_NC}"
+    return 0
+  fi
+
   sed -i 's/__XDEBUG_REMOTE_HOST__/'"$XDEBUG_REMOTE_HOST"'/;
   s/__XDEBUG_IDE_KEY__/'"$XDEBUG_IDE_KEY"'/' \
   ${PHP_XDEBUG_FILE}
@@ -117,6 +122,6 @@ setup_composer_extensions () {
   if [ -n "${COMPOSER_EXTENSIONS}" ]; then
     echo -e "${COLOR_YELLOW}setup_composer_extensions: ${COMPOSER_EXTENSIONS}${COLOR_NC}"
 
-    run_composer require ${COMPOSER_EXTENSIONS} --update-no-dev
+    run_composer require ${COMPOSER_EXTENSIONS}
   fi
 }
diff --git a/docker-compose.yml b/docker-compose.yml
@@ -2,7 +2,7 @@ version: '2'
 services:
   app:
     container_name: syspass-app
-    image: syspass/syspass:3.2.1
+    image: syspass/syspass:3.2.2
     restart: always
     ports:
       - "80"

diff --git a/sysPass-php7.3/Dockerfile b/sysPass-php7.3/Dockerfile
@@ -2,9 +2,9 @@
 # https://syspass.org
 # https://doc.syspass.org
 #
-FROM composer:1.10 as bootstrap
+FROM composer:2.0 as bootstrap
 
-ENV SYSPASS_BRANCH="3.2.1"
+ENV SYSPASS_BRANCH="3.2.2"
 
 RUN git clone --depth 1 --branch ${SYSPASS_BRANCH} https://github.com/nuxsmin/sysPass.git \
   && composer install \
@@ -19,7 +19,7 @@ RUN git clone --depth 1 --branch ${SYSPASS_BRANCH} https://github.com/nuxsmin/sy
 
 FROM debian:buster as app
 
-LABEL [email protected] version=3.2.1 php=7.3 environment=production
+LABEL [email protected] version=3.2.2 php=7.3 environment=production
 
 RUN apt-get update \
   && DEBIAN_FRONTEND=noninteractive apt-get -y install \
@@ -60,7 +60,7 @@ ENV APACHE_RUN_USER="www-data" \
 
 WORKDIR /var/www/html
 
-LABEL build=21011601
+LABEL build=21031301
 
 # Custom sysPass Apache config with SSL by default
 COPY ["syspass.conf", "/etc/apache2/sites-available/"]

diff --git a/sysPass-php7.3/common_fn.sh b/sysPass-php7.3/common_fn.sh
@@ -6,7 +6,7 @@
 : ${COMPOSER_EXTENSIONS:=}
 : ${DEBUG:=0}
 
-if [ ${DEBUG} -eq 1 ]; then
+if [ ${DEBUG} -eq 1 -o ${SYSPASS_DEV} -eq 1 ]; then
   set -x
 fi
 
@@ -29,6 +29,11 @@ setup_apache () {
 
   echo -e "${COLOR_YELLOW}setup_apache: Setting up xdebug variables${COLOR_NC}"
 
+  if [ ! -e ${PHP_XDEBUG_FILE} ]; then
+    echo -e "${COLOR_RED}setup_apache: Xdebug's file not found (${PHP_XDEBUG_FILE})${COLOR_NC}"
+    return 0
+  fi
+
   sed -i 's/__XDEBUG_REMOTE_HOST__/'"$XDEBUG_REMOTE_HOST"'/;
   s/__XDEBUG_IDE_KEY__/'"$XDEBUG_IDE_KEY"'/' \
   ${PHP_XDEBUG_FILE}
@@ -117,6 +122,6 @@ setup_composer_extensions () {
   if [ -n "${COMPOSER_EXTENSIONS}" ]; then
     echo -e "${COLOR_YELLOW}setup_composer_extensions: ${COMPOSER_EXTENSIONS}${COLOR_NC}"
 
-    run_composer require ${COMPOSER_EXTENSIONS} --update-no-dev
+    run_composer require ${COMPOSER_EXTENSIONS}
   fi
 }
diff --git a/sysPass-php7.3/docker-compose.yml b/sysPass-php7.3/docker-compose.yml
@@ -2,7 +2,7 @@ version: '2'
 services:
   app:
     container_name: syspass-app
-    image: syspass/syspass:3.2.1-php7.3
+    image: syspass/syspass:3.2.2-php7.3
     restart: always
     ports:
       - "80"

diff --git a/sysPass-php7.3_dev/Dockerfile b/sysPass-php7.3_dev/Dockerfile
@@ -2,9 +2,9 @@
 # https://syspass.org
 # https://doc.syspass.org
 #
-FROM composer:1.10 as bootstrap
+FROM composer:2.0 as bootstrap
 
-ENV SYSPASS_BRANCH="3.2.1"
+ENV SYSPASS_BRANCH="3.2.2"
 
 RUN git clone --depth 1 --branch ${SYSPASS_BRANCH} https://github.com/nuxsmin/sysPass.git \
   && composer install \
@@ -18,7 +18,7 @@ RUN git clone --depth 1 --branch ${SYSPASS_BRANCH} https://github.com/nuxsmin/sy
 
 FROM debian:buster as app
 
-LABEL [email protected] version=3.2.1 php=7.3 environment=debug
+LABEL [email protected] version=3.2.2 php=7.3 environment=debug
 
 RUN apt-get update \
   && DEBIAN_FRONTEND=noninteractive apt-get -y install \
@@ -60,17 +60,18 @@ ENV APACHE_RUN_USER="www-data" \
     APACHE_PID_FILE="/var/run/apache2.pid" \
     SYSPASS_DIR="/var/www/html/sysPass" \
     SYSPASS_UID=9001 \
-    SYSPASS_DEV=0
+    SYSPASS_DEV=1 \
+    PHP_XDEBUG_FILE="/etc/php/7.3/apache2/conf.d/20-xdebug.ini"
 
 WORKDIR /var/www/html
 
-LABEL build=21011601
+LABEL build=21031301
 
 # Custom sysPass Apache config with SSL by default
 COPY ["syspass.conf", "/etc/apache2/sites-available/"]
 
 # Xdebug module config
-COPY 20-xdebug.ini /etc/php/7.3/apache2/conf.d/20-xdebug.ini
+COPY 20-xdebug.ini ${PHP_XDEBUG_FILE}
 
 # Custom entrypoint
 COPY entrypoint.sh common_fn.sh /usr/local/sbin/

diff --git a/sysPass-php7.3_dev/common_fn.sh b/sysPass-php7.3_dev/common_fn.sh
@@ -6,7 +6,7 @@
 : ${COMPOSER_EXTENSIONS:=}
 : ${DEBUG:=0}
 
-if [ ${DEBUG} -eq 1 ]; then
+if [ ${DEBUG} -eq 1 -o ${SYSPASS_DEV} -eq 1 ]; then
   set -x
 fi
 
@@ -29,6 +29,11 @@ setup_apache () {
 
   echo -e "${COLOR_YELLOW}setup_apache: Setting up xdebug variables${COLOR_NC}"
 
+  if [ ! -e ${PHP_XDEBUG_FILE} ]; then
+    echo -e "${COLOR_RED}setup_apache: Xdebug's file not found (${PHP_XDEBUG_FILE})${COLOR_NC}"
+    return 0
+  fi
+
   sed -i 's/__XDEBUG_REMOTE_HOST__/'"$XDEBUG_REMOTE_HOST"'/;
   s/__XDEBUG_IDE_KEY__/'"$XDEBUG_IDE_KEY"'/' \
   ${PHP_XDEBUG_FILE}
@@ -117,6 +122,6 @@ setup_composer_extensions () {
   if [ -n "${COMPOSER_EXTENSIONS}" ]; then
     echo -e "${COLOR_YELLOW}setup_composer_extensions: ${COMPOSER_EXTENSIONS}${COLOR_NC}"
 
-    run_composer require ${COMPOSER_EXTENSIONS} --update-no-dev
+    run_composer require ${COMPOSER_EXTENSIONS}
   fi
 }
diff --git a/sysPass-php7.3_dev/docker-compose.yml b/sysPass-php7.3_dev/docker-compose.yml
@@ -2,7 +2,7 @@ version: '2'
 services:
   app:
     container_name: syspass-app
-    image: syspass/syspass:3.2.1-php7.3
+    image: syspass/syspass:3.2.2-php7.3
     restart: always
     ports:
       - "80"

diff --git a/sysPass-php7.4/Dockerfile b/sysPass-php7.4/Dockerfile
@@ -3,9 +3,9 @@
 # https://doc.syspass.org
 #
 
-FROM composer:1.10 as bootstrap
+FROM composer:2.0 as bootstrap
 
-ENV SYSPASS_BRANCH="3.2.1"
+ENV SYSPASS_BRANCH="3.2.2"
 
 RUN git clone --depth 1 --branch ${SYSPASS_BRANCH} https://github.com/nuxsmin/sysPass.git \
   && composer install \
@@ -19,7 +19,7 @@ RUN git clone --depth 1 --branch ${SYSPASS_BRANCH} https://github.com/nuxsmin/sy
 
 FROM php:7.4-apache-buster as app
 
-LABEL [email protected] version=3.2.1 php=7.4
+LABEL [email protected] version=3.2.2 php=7.4
 
 RUN apt-get update \
 	&& apt-get install -y \
@@ -46,17 +46,18 @@ RUN pecl install xdebug-2.9.8 \
 ENV APACHE_RUN_USER="www-data" \
     SYSPASS_DIR="/var/www/html/sysPass" \
     SYSPASS_UID=9001 \
-    SYSPASS_DEV=0
+    SYSPASS_DEV=0 \
+    PHP_XDEBUG_FILE="/usr/local/etc/php/conf.d/docker-php-ext-xdebug.ini"
 
 WORKDIR /var/www/html
 
-LABEL build=21011601
+LABEL build=21031301
 
 # Custom sysPass Apache config with SSL by default
 COPY ["syspass.conf", "/etc/apache2/sites-available/"]
 
 # Xdebug module config
-COPY xdebug.ini /usr/local/etc/php/conf.d/docker-php-ext-xdebug.ini
+COPY xdebug.ini ${PHP_XDEBUG_FILE}
 
 # Custom entrypoint
 COPY entrypoint.sh common_fn.sh /usr/local/sbin/

diff --git a/sysPass-php7.4/common_fn.sh b/sysPass-php7.4/common_fn.sh
@@ -6,7 +6,7 @@
 : ${COMPOSER_EXTENSIONS:=}
 : ${DEBUG:=0}
 
-if [ ${DEBUG} -eq 1 ]; then
+if [ ${DEBUG} -eq 1 -o ${SYSPASS_DEV} -eq 1 ]; then
   set -x
 fi
 
@@ -29,6 +29,11 @@ setup_apache () {
 
   echo -e "${COLOR_YELLOW}setup_apache: Setting up xdebug variables${COLOR_NC}"
 
+  if [ ! -e ${PHP_XDEBUG_FILE} ]; then
+    echo -e "${COLOR_RED}setup_apache: Xdebug's file not found (${PHP_XDEBUG_FILE})${COLOR_NC}"
+    return 0
+  fi
+
   sed -i 's/__XDEBUG_REMOTE_HOST__/'"$XDEBUG_REMOTE_HOST"'/;
   s/__XDEBUG_IDE_KEY__/'"$XDEBUG_IDE_KEY"'/' \
   ${PHP_XDEBUG_FILE}
@@ -117,6 +122,6 @@ setup_composer_extensions () {
   if [ -n "${COMPOSER_EXTENSIONS}" ]; then
     echo -e "${COLOR_YELLOW}setup_composer_extensions: ${COMPOSER_EXTENSIONS}${COLOR_NC}"
 
-    run_composer require ${COMPOSER_EXTENSIONS} --update-no-dev
+    run_composer require ${COMPOSER_EXTENSIONS}
   fi
 }
diff --git a/sysPass-php7.4/docker-compose.yml b/sysPass-php7.4/docker-compose.yml
@@ -2,7 +2,7 @@ version: '2'
 services:
   app:
     container_name: syspass-app
-    image: syspass/syspass:3.2.1-php7.4
+    image: syspass/syspass:3.2.2-php7.4
     restart: always
     ports:
       - "80"