From 370463c454944d9b65b29c6c22d6ce34c0752671 Mon Sep 17 00:00:00 2001 From: agilecohix Date: Tue, 29 May 2018 15:05:05 -0400 Subject: [PATCH 1/2] Changed docker image reference to new hub organization --- docker-compose/README.md | 2 +- docker-compose/docker-compose.yml | 2 +- docker-swarm/README.md | 2 +- docker-swarm/docker-compose.yml | 2 +- kubernetes/op-scim-deployment.yaml | 2 +- session/create-session-file.sh | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/docker-compose/README.md b/docker-compose/README.md index 3b9c110..b8d4fb7 100644 --- a/docker-compose/README.md +++ b/docker-compose/README.md @@ -27,6 +27,6 @@ Once your scimsession file has been created, copy it into this directory (next t Next, edit `docker-compose.yml`, replacing `{YOUR-DOMAIN-HERE}` with the domain name indicated by the DNS record created for your SCIM bridge. This will configure LetsEncrypt to automatically issue a certificate for your bridge. -Running `docker-compose up --build` will now create a container from the `onepassword/scim` image. A redis container will also be started automatically to be used by the SCIM bridge. _After the DNS record has been propogated_, you can continue setting up your IdP with the SCIM bridge Administration Guide while monitoring the logs from the bridge on your local machine. +Running `docker-compose up --build` will now create a container from the `1password/scim` image. A redis container will also be started automatically to be used by the SCIM bridge. _After the DNS record has been propogated_, you can continue setting up your IdP with the SCIM bridge Administration Guide while monitoring the logs from the bridge on your local machine. Once you have tested the configuration, the bridge can be exited using ctrl/cmd-c, and restarted in daemon mode using `docker-compose up -d, or deployed for production use with Docker Swarm or Kubernetes. You can access logs using `docker-compose logs` at any point in the future. \ No newline at end of file diff --git a/docker-compose/docker-compose.yml b/docker-compose/docker-compose.yml index 2d04243..4751361 100644 --- a/docker-compose/docker-compose.yml +++ b/docker-compose/docker-compose.yml @@ -2,7 +2,7 @@ version: '3.3' services: scim: - image: onepassword/scim:v0.4.4 + image: 1password/scim:v0.4.4 ports: - "80:8080" - "443:8443" diff --git a/docker-swarm/README.md b/docker-swarm/README.md index b27270e..0138f14 100644 --- a/docker-swarm/README.md +++ b/docker-swarm/README.md @@ -25,4 +25,4 @@ Once your scimsession file has been created, copy it into this directory (next t Next, edit `docker-compose.yml`, replacing `{YOUR-DOMAIN-HERE}` with the domain name indicated by the DNS record created for your SCIM bridge. This will configure LetsEncrypt to automatically issue a certificate for your bridge. -Running `docker stack deploy -c docker-compose.yml op-scim` will now create a container from the `onepassword/scim` image. A redis container will also be started automatically to be used by the SCIM bridge. _After the DNS record has been propogated_, you can continue setting up your IdP with the SCIM bridge Administration Guide while monitoring the logs from the bridge on your local machine using `docker service logs -f op-scim_scim`. \ No newline at end of file +Running `docker stack deploy -c docker-compose.yml op-scim` will now create a container from the `1password/scim` image. A redis container will also be started automatically to be used by the SCIM bridge. _After the DNS record has been propogated_, you can continue setting up your IdP with the SCIM bridge Administration Guide while monitoring the logs from the bridge on your local machine using `docker service logs -f op-scim_scim`. \ No newline at end of file diff --git a/docker-swarm/docker-compose.yml b/docker-swarm/docker-compose.yml index aa35a98..4f3b376 100644 --- a/docker-swarm/docker-compose.yml +++ b/docker-swarm/docker-compose.yml @@ -2,7 +2,7 @@ version: '3.3' services: scim: - image: onepassword/scim:v0.4.4 + image: 1password/scim:v0.4.4 deploy: replicas: 1 restart_policy: diff --git a/kubernetes/op-scim-deployment.yaml b/kubernetes/op-scim-deployment.yaml index aea4029..136614b 100644 --- a/kubernetes/op-scim-deployment.yaml +++ b/kubernetes/op-scim-deployment.yaml @@ -14,7 +14,7 @@ spec: spec: containers: - name: op-scim - image: onepassword/scim:v0.4.4 + image: 1password/scim:v0.4.4 command: ["./op-scim"] args: ["--session=/secret/scimsession", "--letsencrypt-domain={YOUR-DOMAIN-HERE}"] ports: diff --git a/session/create-session-file.sh b/session/create-session-file.sh index 74e6fb3..6f9cc4a 100755 --- a/session/create-session-file.sh +++ b/session/create-session-file.sh @@ -2,7 +2,7 @@ mkdir session -docker run -it -v $PWD/session:'/op-scim/session' onepassword/scim /op-scim/create-session-docker.sh +docker run -it -v $PWD/session:'/op-scim/session' 1password/scim /op-scim/create-session-docker.sh cp ./session/scimsession ./scimsession rm -rf ./session \ No newline at end of file From 95376d373263337ac8d760e78faf9166ac48b4db Mon Sep 17 00:00:00 2001 From: agilecohix Date: Fri, 1 Jun 2018 14:06:44 -0400 Subject: [PATCH 2/2] Updated to v0.5 image --- docker-compose/docker-compose.yml | 2 +- docker-swarm/docker-compose.yml | 2 +- kubernetes/op-scim-deployment.yaml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/docker-compose/docker-compose.yml b/docker-compose/docker-compose.yml index 4751361..47f2e5b 100644 --- a/docker-compose/docker-compose.yml +++ b/docker-compose/docker-compose.yml @@ -2,7 +2,7 @@ version: '3.3' services: scim: - image: 1password/scim:v0.4.4 + image: 1password/scim:v0.5 ports: - "80:8080" - "443:8443" diff --git a/docker-swarm/docker-compose.yml b/docker-swarm/docker-compose.yml index 4f3b376..5380ccb 100644 --- a/docker-swarm/docker-compose.yml +++ b/docker-swarm/docker-compose.yml @@ -2,7 +2,7 @@ version: '3.3' services: scim: - image: 1password/scim:v0.4.4 + image: 1password/scim:v0.5 deploy: replicas: 1 restart_policy: diff --git a/kubernetes/op-scim-deployment.yaml b/kubernetes/op-scim-deployment.yaml index 136614b..7f3404d 100644 --- a/kubernetes/op-scim-deployment.yaml +++ b/kubernetes/op-scim-deployment.yaml @@ -14,7 +14,7 @@ spec: spec: containers: - name: op-scim - image: 1password/scim:v0.4.4 + image: 1password/scim:v0.5 command: ["./op-scim"] args: ["--session=/secret/scimsession", "--letsencrypt-domain={YOUR-DOMAIN-HERE}"] ports: