Skip to content

Commit

Permalink
[MOD] Change branch for building sysPass images
Browse files Browse the repository at this point in the history
[MOD] Updated docker-compose files to set 2.1 tag
  • Loading branch information
nuxsmin committed Jan 3, 2019
1 parent 82a370b commit aee79c4
Show file tree
Hide file tree
Showing 4 changed files with 12 additions and 7 deletions.
13 changes: 9 additions & 4 deletions docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,16 +2,16 @@ version: '2'
services:
app:
container_name: syspass-app
image: nuxsmin/docker-syspass:latest
image: nuxsmin/docker-syspass:2.1
restart: always
ports:
- "80:80"
- "443:443"
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
Expand All @@ -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: {}
2 changes: 1 addition & 1 deletion sysPass-dev-php7/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion sysPass-dev/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion sysPass/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit aee79c4

Please sign in to comment.