Skip to content

Commit 3c0d063

Browse files
v2.3.0, documenting new env flag
1 parent 1412bb6 commit 3c0d063

File tree

9 files changed

+23
-4
lines changed

9 files changed

+23
-4
lines changed

aws-ecsfargate-terraform/task-definitions/scim.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
[
22
{
33
"name": "scim-bridge",
4-
"image": "1password/scim:v2.2.1",
4+
"image": "1password/scim:v2.3.0",
55
"cpu": 128,
66
"memory": 512,
77
"essential": true,

docker/README.md

+1
Original file line numberDiff line numberDiff line change
@@ -157,6 +157,7 @@ The following options are available for advanced or custom deployments. Unless y
157157
* `OP_REDIS_URL` - you can specify `redis://` or `rediss://` (for TLS) URL here to point towards an alternative Redis host. You can then strip out the sections in `docker-compose.yml` that refer to Redis to not deploy that container. Note that Redis is still required for the SCIM bridge to function.
158158
* `OP_PRETTY_LOGS` - can be set to `1` if you would like the SCIM bridge to output logs in a human-readable format. This can be helpful if you aren’t planning on doing custom log ingestion in your environment.
159159
* `OP_DEBUG` - can be set to `1` to enable debug output in the logs. Useful for troubleshooting or when contacting 1Password Support.
160+
* `OP_PING_SERVER` - can be set to `1` to enable an optional `/ping` endpoint on port `80`. Useful for health checks. Disabled if `OP_LETSENCRYPT_DOMAIN` is unset and TLS is not utilized.
160161

161162
#### Generating `scim.env` file on Windows
162163

docker/compose/docker-compose.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
version: "2.2"
22
services:
33
scim:
4-
image: 1password/scim:v2.2.1
4+
image: 1password/scim:v2.3.0
55
ports:
66
- "3002:3002"
77
- "80:8080"

docker/compose/scim.env

+4
Original file line numberDiff line numberDiff line change
@@ -28,3 +28,7 @@ OP_REDIS_URL=redis://redis:6379
2828

2929
# OP_LETSENCRYPT_EMAIL changes the email address provided to Let's Encrypt when a certificate is issued for your SCIM bridge, default: "1pw@[OP_LETSENCRYPT_DOMAIN]"
3030
31+
32+
# OP_PING_SERVER brings up a `/ping` endpoint which can be useful for health checks
33+
# It is disabled if OP_LETSENCRYPT_DOMAIN is unset
34+
#OP_PING_SERVER=1

docker/swarm/docker-compose.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
version: "3.3"
22
services:
33
scim:
4-
image: 1password/scim:v2.2.1
4+
image: 1password/scim:v2.3.0
55
deploy:
66
replicas: 1
77
restart_policy:

docker/swarm/scim.env

+4
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,10 @@ OP_REDIS_URL=redis://redis:6379
2121
# OP_DEBUG enables more detailed logging, which can be useful during troubleshooting or debugging
2222
#OP_DEBUG=1
2323

24+
# OP_PING_SERVER brings up a `/ping` endpoint which can be useful for health checks
25+
# It is disabled if OP_LETSENCRYPT_DOMAIN is unset
26+
#OP_PING_SERVER=1
27+
2428
# OP_SESSION can be either the base64-encoded string of a `scimsession` file, or it can be the path to a `scimsession` file (as in a Docker Swarm Secret)
2529
# examples: "OP_SESSION=abcdefg123456", "OP_SESSION=/path/to/scimsession"
2630
# NOTE: this should not be changed when deploying with Docker Swarm

kubernetes/README.md

+9
Original file line numberDiff line numberDiff line change
@@ -155,3 +155,12 @@ You can set `OP_PRETTY_LOGS` to `1` if you would like the SCIM bridge to output
155155
### Debug Mode
156156

157157
You can set `OP_DEBUG` to `1` to enable debug output in the logs. Useful for troubleshooting or when contacting 1Password Support.
158+
159+
### Health Check Ping Server
160+
161+
When using Let’s Encrypt on some Kubernetes clusters, health checks can fail for the SCIM bridge before the bridge is able to obtain a Let’s Encrypt certificate.
162+
163+
You can set `OP_PING_SERVER` to `1` to enable a `/ping` endpoint on port `80` so that health checks will always be brought online. For security reasons, no other endpoints (such as `/scim`) are exposed through this port.
164+
165+
The endpoint is disabled if `OP_LETSENCRYPT_DOMAIN` is set to blank and TLS is not utilized.
166+

kubernetes/op-scim-config.yaml

+1
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ data:
1010
OP_SESSION: "/secret/scimsession"
1111
OP_PRETTY_LOGS: "0"
1212
OP_DEBUG: "0"
13+
OP_PING_SERVER: "0"
1314
# (optional) uncomment this line to change the email that is used when Let's Encrypt issues your SCIM bridge a certificate
1415
# default: "1pw@[OP_LETSENCRYPT_DOMAIN]"
1516
#OP_LETSENRYPT_EMAIL: "[email protected]"

kubernetes/op-scim-deployment.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ spec:
1414
spec:
1515
containers:
1616
- name: op-scim-bridge
17-
image: 1password/scim:v2.2.1
17+
image: 1password/scim:v2.3.0
1818
ports:
1919
- containerPort: 3002
2020
volumeMounts:

0 commit comments

Comments
 (0)