From aee79c4d09d83833ed597d34583f27bdc3fbdd90 Mon Sep 17 00:00:00 2001 From: nuxsmin Date: Thu, 3 Jan 2019 22:36:50 +0100 Subject: [PATCH] [MOD] Change branch for building sysPass images [MOD] Updated docker-compose files to set 2.1 tag --- docker-compose.yml | 13 +++++++++---- sysPass-dev-php7/Dockerfile | 2 +- sysPass-dev/Dockerfile | 2 +- sysPass/Dockerfile | 2 +- 4 files changed, 12 insertions(+), 7 deletions(-) diff --git a/docker-compose.yml b/docker-compose.yml index 73c0b35..54998e5 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -2,7 +2,7 @@ version: '2' services: app: container_name: syspass-app - image: nuxsmin/docker-syspass:latest + image: nuxsmin/docker-syspass:2.1 restart: always ports: - "80:80" @@ -10,8 +10,8 @@ services: links: - db volumes: - - /var/www/html/sysPass/config - - /var/www/html/sysPass/backup + - syspass-config:/var/www/html/sysPass/config + - syspass-backup:/var/www/html/sysPass/backup db: container_name: syspass-db restart: always @@ -22,4 +22,9 @@ services: - DB_REMOTE_HOST=syspass-app.syspass_default - DB_REMOTE_ROOT_PASS=syspass volumes: - - /var/lib/mysql + - syspass-db:/var/lib/mysql + +volumes: + syspass-config: {} + syspass-backup: {} + syspass-db: {} diff --git a/sysPass-dev-php7/Dockerfile b/sysPass-dev-php7/Dockerfile index b56cbfc..c0f0fe8 100644 --- a/sysPass-dev-php7/Dockerfile +++ b/sysPass-dev-php7/Dockerfile @@ -22,7 +22,7 @@ ENV APACHE_RUN_USER="www-data" \ APACHE_LOG_DIR="/var/log/apache2" \ APACHE_LOCK_DIR="/var/lock/apache2" \ APACHE_PID_FILE="/var/run/apache2.pid" \ - SYSPASS_BRANCH="devel" \ + SYSPASS_BRANCH="2.1" \ SYSPASS_UID=9001 WORKDIR /var/www/html diff --git a/sysPass-dev/Dockerfile b/sysPass-dev/Dockerfile index b869339..e9979dc 100644 --- a/sysPass-dev/Dockerfile +++ b/sysPass-dev/Dockerfile @@ -20,7 +20,7 @@ ENV APACHE_RUN_USER="www-data" \ APACHE_LOG_DIR="/var/log/apache2" \ APACHE_LOCK_DIR="/var/lock/apache2" \ APACHE_PID_FILE="/var/run/apache2.pid" \ - SYSPASS_BRANCH="devel" \ + SYSPASS_BRANCH="2.1" \ SYSPASS_UID=9001 WORKDIR /var/www/html diff --git a/sysPass/Dockerfile b/sysPass/Dockerfile index cffa6dc..67f8026 100644 --- a/sysPass/Dockerfile +++ b/sysPass/Dockerfile @@ -18,7 +18,7 @@ ENV APACHE_RUN_USER="www-data" \ APACHE_LOG_DIR="/var/log/apache2" \ APACHE_LOCK_DIR="/var/lock/apache2" \ APACHE_PID_FILE="/var/run/apache2.pid" \ - SYSPASS_BRANCH="master" \ + SYSPASS_BRANCH="2.1" \ SYSPASS_UID=9001 WORKDIR /var/www/html