Skip to content

Commit 29ff30b

Browse files
tiredofittiredofit
committed
Refactor Image to support new tiredofit/nginx-php-fpm base
1 parent 9b95048 commit 29ff30b

File tree

7 files changed

+267
-306
lines changed

7 files changed

+267
-306
lines changed

‎CHANGELOG.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,8 @@
1+
## 4.0 2019-12-06 <dave at tiredofit dot ca>
2+
3+
* Refactored Image to support new tiredofit/nginx-php-fpm image
4+
* PHP 7.3
5+
16
## 3.1 2019-02-15 <dave at tiredofit dot ca>
27

38
* Add USE_TOKENS

‎Dockerfile

Lines changed: 15 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,20 @@
1-
FROM tiredofit/nginx-php-fpm:7.2
1+
FROM tiredofit/nginx-php-fpm:7.3
22
LABEL maintainer="Dave Conroy (dave at tiredofit dot ca)"
33

4-
### Environment Variables
5-
ENV SSP_VERSION=1.3
4+
ENV SSP_VERSION=1.3 \
5+
PHP_ENABLE_LDAP=TRUE \
6+
PHP_ENABLE_CREATE_SAMPLE_PHP=FALSE \
7+
NGINX_WEBROOT="/www/ssp" \
8+
ZABBIX_HOSTNAME=ssp-app
69

7-
### Download and setup files
8-
RUN mkdir -p /assets/install && \
9-
echo '** Downloading Self Service Password version '${SSP_VERSION} && \
10-
curl -sSL -o /assets/install/v${SSP_VERSION}.tar.gz https://github.com/ltb-project/self-service-password/archive/v1.3.tar.gz
10+
### Dependency Installation
11+
RUN set -x && \
12+
apk update && \
13+
apk upgrade && \
14+
mkdir -p /assets/install && \
15+
echo '** Downloading Self Service Password version '${SSP_VERSION} && \
16+
curl -sSL -o /assets/install/v${SSP_VERSION}.tar.gz https://github.com/ltb-project/self-service-password/archive/v${SSP_VERSION}.tar.gz && \
17+
rm -rf /var/cache/apk/*
1118

1219
### Files Addition
13-
ADD install /
20+
ADD install /

‎README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ Dockerfile to build a [LTB-Self Service Password](https://ltb-project.org/docume
1212

1313
* This Container uses a [customized Alpine Linux base](https://hub.docker.com/r/tiredofit/alpine) which includes [s6 overlay](https://github.com/just-containers/s6-overlay) enabled for PID 1 Init capabilities, [zabbix-agent](https://zabbix.org) for individual container monitoring, Cron also installed along with other tools (bash,curl, less, logrotate, nano, vim) for easier management.
1414

15-
This Container uses [tiredofit/alpine:3.8](https://hub.docker.com/r/tiredofit/alpine as a base, and [tiredofit/nginx-php-fpm:7.2](https://hub.docker.com/r/tiredofit/nginx-php-fpm) to provide the serving of the content.
15+
This Container uses [tiredofit/alpine:3.10](https://hub.docker.com/r/tiredofit/alpine as a base, and [tiredofit/nginx-php-fpm:7.3](https://hub.docker.com/r/tiredofit/nginx-php-fpm) to provide the serving of the content.
1616

1717
[Changelog](CHANGELOG.md)
1818

‎examples/docker-compose.yml

Lines changed: 78 additions & 80 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,20 @@
1-
version: '2'
2-
1+
version: '3.7'
32
services:
3+
44
ssp-app:
55
image: tiredofit/self-service-password:latest
66
container_name: ssp-app
7+
labels:
8+
- traefik.enable=true
9+
- traefik.frontend.rule=Host:url.example.com
10+
- traefik.port=80
11+
- traefik.protocol=http
12+
- traefik.docker.network=proxy
13+
- traefik.backend=ssp-app
714
volumes:
815
- ./data/:/www/ssp
916
- ./logs/:/www/logs
1017
environment:
11-
- VIRTUAL_HOST=url.hostname.com
12-
- VIRTUAL_NETWORK=nginx-proxy
13-
- VIRTUAL_PORT=80
14-
- LETSENCRYPT_HOST=url.hostname.com
15-
- [email protected]
16-
17-
- ZABBIX_HOSTNAME=ssp-app
18-
1918
- LDAP_SERVER=ldap://openldap.example.com
2019
- LDAP_STARTTLS=false
2120
- LDAP_BINDDN=cn=admin,dc=example,dc=com
@@ -24,122 +23,121 @@ services:
2423
- LDAP_LOGIN_ATTRIBUTE=uid
2524
- LDAP_FULLNAME_ATTRIBUTE=cn
2625

27-
# Active Directory mode
28-
# true: use unicodePwd as password field
29-
# false: LDAPv3 standard behavior
26+
# Active Directory mode
27+
# true: use unicodePwd as password field
28+
# false: LDAPv3 standard behavior
3029
- ADMODE=false
31-
# Force account unlock when password is changed
30+
# Force account unlock when password is changed
3231
- AD_OPT_FORCE_UNLOCK=false
33-
# Force user change password at next login
32+
# Force user change password at next login
3433
- AD_OPT_FORCE_PWD_CHANGE=false
35-
# Allow user with expired password to change password
34+
# Allow user with expired password to change password
3635
- AD_OPT_CHANGE_EXPIRED_PASSWORD=false
3736

38-
# Samba mode
39-
# true: update sambaNTpassword and sambaPwdLastSet attributes too
40-
# false: just update the password
37+
# Samba mode
38+
# true: update sambaNTpassword and sambaPwdLastSet attributes too
39+
# false: just update the password
4140
- SAMBA_MODE=false
4241

43-
# Shadow options - require shadowAccount objectClass
44-
# Update shadowLastChange
42+
# Shadow options - require shadowAccount objectClass
43+
# Update shadowLastChange
4544
- SHADOW_OPT_UPDATE_SHADOWLASTCHANGE=false
46-
# Hash mechanism for password:
47-
# SSHA
48-
# SHA
49-
# SMD5
50-
# MD5
51-
# CRYPT
52-
# clear (the default)
53-
# auto (will check the hash of current password)
54-
# This option is not used with ad_mode = true
45+
# Hash mechanism for password:
46+
# SSHA
47+
# SHA
48+
# SMD5
49+
# MD5
50+
# CRYPT
51+
# clear (the default)
52+
# auto (will check the hash of current password)
53+
# This option is not used with ad_mode = true
5554
- PASSWORD_HASH=auto
5655

57-
# Local password policy
58-
# This is applied before directory password policy
59-
# Minimal length
56+
# Local password policy
57+
# This is applied before directory password policy
58+
# Minimal length
6059
- PASSWORD_MIN_LENGTH: 0
61-
# Maximal length
60+
# Maximal length
6261
- PASSWORD_MAX_LENGTH: 0
63-
# Minimal lower characters
62+
# Minimal lower characters
6463
- PASSWORD_MIN_LOWERCASE: 0
65-
# Minimal upper characters
64+
# Minimal upper characters
6665
- PASSWORD_MIN_UPPERCASE: 0
67-
# Minimal digit characters
66+
# Minimal digit characters
6867
- PASSWORD_MIN_DIGIT: 0
69-
# Minimal special characters
68+
# Minimal special characters
7069
- PASSWORD_MIN_SPECIAL: 0
71-
# Dont reuse the same password as currently
70+
# Dont reuse the same password as currently
7271
- PASSWORD_NO_REUSE=true
73-
# Show policy constraints message:
74-
# always
75-
# never
76-
# onerror
72+
# Show policy constraints message:
73+
# always
74+
# never
75+
# onerror
7776
- PASSWORD_SHOW_POLICY=never
78-
# Position of password policy constraints message:
79-
# above - the form
80-
# below - the form
77+
# Position of password policy constraints message:
78+
# above - the form
79+
# below - the form
8180
- PASSWORD_SHOW_POLICY_POSITION=above
8281

83-
# Who changes the password?
84-
# Also applicable for question/answer save
85-
# user: the user itself
86-
# manager: the above binddn
82+
# Who changes the password?
83+
# Also applicable for question/answer save
84+
# user: the user itself
85+
# manager: the above binddn
8786
- WHO_CAN_CHANGE_PASSWORD=user
8887

89-
## Questions/answers
90-
# Use questions/answers?
91-
# true (default)
92-
# false
88+
## Questions/answers
89+
# Use questions/answers?
90+
# true (default)
91+
# false
9392
- QUESTIONS_ENABLED=false
9493

95-
## Mail
96-
# LDAP mail attribute
94+
## Mail
95+
# LDAP mail attribute
9796
- LDAP_MAIL_ATTRIBUTE=mail
98-
# Who the email should come from
97+
# Who the email should come from
9998
- [email protected]
10099
- MAIL_FROM_NAME=Password Admin
101-
# Notify users anytime their password is changed
100+
# Notify users anytime their password is changed
102101
- NOTIFY_ON_CHANGE=true
103-
# PHPMailer configuration (see https://github.com/PHPMailer/PHPMailer)
102+
# PHPMailer configuration (see https://github.com/PHPMailer/PHPMailer)
104103
- SMTP_DEBUG: 0
105104
- SMTP_HOST=smtp.example.com
106105
- SMTP_AUTH_ON=true
107106
- [email protected]
108107
- SMTP_PASS=smtppassword
109108
- SMTP_PORT: 587
110109
- SMTP_SECURE_TYPE=tls
111-
- SMTP_AUTOTLS=false
112-
## SMS
113-
# Use sms (NOT WORKING YET)
110+
## SMS
111+
# Use sms (NOT WORKING YET)
114112
- USE_SMS=false
115-
# Reset URL (if behind a reverse proxy)
113+
# Reset URL (if behind a reverse proxy)
116114
- IS_BEHIND_PROXY=false
117-
# Display help messages
115+
# Display help messages
118116
- SHOW_HELP=true
119-
# Language
117+
# Language
120118
- LANG=en
121-
# Debug mode
119+
# Debug mode
122120
- DEBUG_MODE=false
123-
# Encryption, decryption keyphrase
121+
# Encryption, decryption keyphrase
124122
- SECRETEKEY=secretkey
125-
## CAPTCHA
126-
# Use Google reCAPTCHA (http://www.google.com/recaptcha)
123+
## CAPTCHA
124+
# Use Google reCAPTCHA (http://www.google.com/recaptcha)
127125
- USE_RECAPTCHA=false
128-
# Go on the site to get public and private key
126+
# Go on the site to get public and private key
129127
- RECAPTCHA_PUB_KEY=akjsdnkajnd
130128
- RECAPTCHA_PRIV_KEY=aksdjnakjdnsa
131-
## Default action
132-
# change
133-
# sendtoken
134-
# sendsms
129+
## Default action
130+
# change
131+
# sendtoken
132+
# sendsms
135133
- DEFAULT_ACTION=change
136-
137134
networks:
138-
- proxy-tier
135+
- proxy
136+
- services
139137
restart: always
140138

141139
networks:
142-
proxy-tier:
143-
external:
144-
name: nginx-proxy
145-
140+
proxy:
141+
external: true
142+
services:
143+
external: true

0 commit comments

Comments
 (0)