Changing to docker-flow account

Dockerfile.packetbeat

@@ -1,4 +1,4 @@
-FROM vfarcic/docker-flow-proxy
+FROM dockerflow/docker-flow-proxy
 
 RUN apk add --update \
     openssl \

Dockerfile.test

@@ -1,4 +1,4 @@
-FROM vfarcic/docker-flow-proxy-test-base
+FROM dockerflow/docker-flow-proxy-test-base
 
 COPY . /src
 WORKDIR /src

Jenkinsfile

@@ -16,13 +16,13 @@ pipeline {
           currentBuild.displayName = dateFormat.format(new Date()) + "-" + env.BUILD_NUMBER
         }
         dfBuild2("docker-flow-proxy")
-        sh "docker image build -t vfarcic/docker-flow-proxy:latest-packet-beat -f Dockerfile.packetbeat ."
-        sh "docker image tag vfarcic/docker-flow-proxy:latest-packet-beat vfarcic/docker-flow-proxy:${currentBuild.displayName}-packet-beat"
+        sh "docker image build -t dockerflow/docker-flow-proxy:latest-packet-beat -f Dockerfile.packetbeat ."
+        sh "docker image tag dockerflow/docker-flow-proxy:latest-packet-beat dockerflow/docker-flow-proxy:${currentBuild.displayName}-packet-beat"
       }
     }
     stage("staging") {
       environment {
-        DOCKER_HUB_USER = "vfarcic"
+        DOCKER_HUB_USER = "dockerflow"
       }
       steps {
         script {
@@ -38,8 +38,8 @@ pipeline {
       }
       steps {
         dockerLogin()
-        sh "docker image push vfarcic/docker-flow-proxy:latest-packet-beat"
-        sh "docker image push vfarcic/docker-flow-proxy:${currentBuild.displayName}-packet-beat"
+        sh "docker image push dockerflow/docker-flow-proxy:latest-packet-beat"
+        sh "docker image push dockerflow/docker-flow-proxy:${currentBuild.displayName}-packet-beat"
         dockerLogout()
         dfRelease2("docker-flow-proxy")
         dfReleaseGithub2("docker-flow-proxy")
@@ -54,7 +54,7 @@ pipeline {
         label "prod"
       }
       steps {
-        dfDeploy2("docker-flow-proxy", "proxy_proxy", "proxy_docs")
+        // dfDeploy2("docker-flow-proxy", "proxy_proxy", "proxy_docs")
       }
     }
   }

README.md

@@ -1,9 +1,9 @@
 # Docker Flow Proxy
 
-[![GitHub release](https://img.shields.io/github/release/vfarcic/docker-flow-proxy.svg)]()
-[![license](https://img.shields.io/github/license/vfarcic/docker-flow-proxy.svg)]()
-[![Docker Pulls](https://img.shields.io/docker/pulls/vfarcic/docker-flow-proxy.svg)]()
-[![Go Report Card](https://goreportcard.com/badge/github.com/vfarcic/docker-flow-proxy)](https://goreportcard.com/report/github.com/vfarcic/docker-flow-proxy)
+[![GitHub release](https://img.shields.io/github/release/docker-flow/docker-flow-proxy.svg)]()
+[![license](https://img.shields.io/github/license/docker-flow/docker-flow-proxy.svg)]()
+[![Docker Pulls](https://img.shields.io/docker/pulls/docker-flow/docker-flow-proxy.svg)]()
+[![Go Report Card](https://goreportcard.com/badge/github.com/docker-flow/docker-flow-proxy)](https://goreportcard.com/report/github.com/docker-flow/docker-flow-proxy)
 
 The goal of the *Docker Flow Proxy* project is to provide an easy way to reconfigure proxy every time a new service is deployed, or when a service is scaled. It does not try to "reinvent the wheel", but to leverage the existing leaders and combine them through an easy to use integration. It uses [HAProxy](http://www.haproxy.org/) as a proxy and adds custom logic that allows on-demand reconfiguration.
 

docker-compose-demo.yml

@@ -2,7 +2,7 @@ version: '2'
 
 services:
   app:
-    image: vfarcic/books-ms
+    image: dockerflow/books-ms
     ports:
       - 8080
     environment:

docker-compose-demo2.yml

@@ -3,7 +3,7 @@ version: '2'
 services:
 
   app:
-    image: vfarcic/go-demo
+    image: dockerflow/go-demo
     ports:
       - 8080
 

docker-compose-stack.yml

@@ -3,7 +3,7 @@ version: "3"
 services:
 
   proxy:
-    image: vfarcic/docker-flow-proxy
+    image: dockerflow/docker-flow-proxy
     ports:
       - 80:80
       - 443:443
@@ -16,7 +16,7 @@ services:
       replicas: 2
 
   swarm-listener:
-    image: vfarcic/docker-flow-swarm-listener
+    image: dockerflow/docker-flow-swarm-listener
     networks:
       - proxy
     volumes:

docker-compose-test.yml

@@ -4,15 +4,15 @@ version: "2"
 services:
 
   staging-swarm:
-    image: vfarcic/docker-flow-proxy-test
+    image: dockerflow/docker-flow-proxy-test
     volumes:
       - /var/run/docker.sock:/var/run/docker.sock
     environment:
       - HOST_IP=${HOST_IP}
       - DOCKER_HUB_USER=${DOCKER_HUB_USER}
 
   staging-swarm-local:
-    image: vfarcic/docker-flow-proxy-test
+    image: dockerflow/docker-flow-proxy-test
     volumes:
       - /var/run/docker.sock:/var/run/docker.sock
       - .:/src

docker-compose.yml

@@ -35,7 +35,7 @@ services:
 
   proxy:
     container_name: docker-flow-proxy
-    image: vfarcic/docker-flow-proxy
+    image: dockerflow/docker-flow-proxy
     environment:
       CONSUL_ADDRESS: $CONSUL_IP:8500
       PROXY_INSTANCE_NAME: docker-flow
@@ -49,7 +49,7 @@ services:
   app:
     build: .
     container_name: docker-flow-proxy
-    image: vfarcic/docker-flow-proxy
+    image: dockerflow/docker-flow-proxy
     environment:
       CONSUL_ADDRESS: $CONSUL_IP:8500
     ports:

docs/blocking.md

@@ -21,7 +21,7 @@ To setup an example Swarm cluster using Docker Machine, please run the commands
 ```bash
 curl -o swarm-cluster.sh \
     https://raw.githubusercontent.com/\
-vfarcic/docker-flow-proxy/master/scripts/swarm-cluster.sh
+docker-flow/docker-flow-proxy/master/scripts/swarm-cluster.sh
 
 chmod +x swarm-cluster.sh
 
@@ -39,13 +39,13 @@ docker network create --driver overlay proxy
 
 curl -o docker-compose-stack.yml \
     https://raw.githubusercontent.com/\
-vfarcic/docker-flow-proxy/master/docker-compose-stack.yml
+docker-flow/docker-flow-proxy/master/docker-compose-stack.yml
 
 docker stack deploy -c docker-compose-stack.yml proxy
 
 curl -o docker-compose-go-demo.yml \
     https://raw.githubusercontent.com/\
-vfarcic/go-demo/master/docker-compose-stack.yml
+docker-flow/go-demo/master/docker-compose-stack.yml
 
 docker stack deploy -c docker-compose-go-demo.yml go-demo
 ```

docs/certs.md

@@ -24,7 +24,7 @@ To setup an example Swarm cluster using Docker Machine, please run the commands
 ```bash
 curl -o swarm-cluster.sh \
     https://raw.githubusercontent.com/\
-vfarcic/docker-flow-proxy/master/scripts/swarm-cluster.sh
+docker-flow/docker-flow-proxy/master/scripts/swarm-cluster.sh
 
 chmod +x swarm-cluster.sh
 
@@ -40,13 +40,13 @@ docker network create --driver overlay proxy
 
 curl -o docker-compose-stack.yml \
     https://raw.githubusercontent.com/\
-vfarcic/docker-flow-proxy/master/docker-compose-stack.yml
+docker-flow/docker-flow-proxy/master/docker-compose-stack.yml
 
 docker stack deploy -c docker-compose-stack.yml proxy
 
 curl -o docker-compose-go-demo.yml \
     https://raw.githubusercontent.com/\
-vfarcic/go-demo/master/docker-compose-stack.yml
+docker-flow/go-demo/master/docker-compose-stack.yml
 
 docker stack deploy -c docker-compose-go-demo.yml go-demo
 ```
@@ -78,11 +78,11 @@ The error means that there is no certificate that should be used with HTTPS traf
 There are two ways we can add certificates to the proxy. One is to create your own Docker image based on `docker-flow-proxy`. `Dockerfile` could be as follows.
 
 ```
-FROM vfarcic/docker-flow-proxy
+FROM dockerflow/docker-flow-proxy
 COPY my-cert.pem /certs/my-cert.pem
 ```
 
-When the image is built, it will be based on `vfarcic/docker-flow-proxy` and include `my-cert.pem` file. The `my-cert.pem` would be your certificate. Docker Flow proxy will load all certificates located in the `/certs` directory.
+When the image is built, it will be based on `dockerflow/docker-flow-proxy` and include `my-cert.pem` file. The `my-cert.pem` would be your certificate. Docker Flow proxy will load all certificates located in the `/certs` directory.
 
 If your certificate is static (almost never changes) and you are willing to create your own `docker-flow-proxy` image, this might be a good option. An alternative would be to mount a network volume with certificates.
 

docs/config.md

@@ -1,6 +1,6 @@
 # Configuring Docker Flow Proxy
 
-*Docker Flow Proxy* can be configured through Docker environment variables and/or by creating a new image based on `vfarcic/docker-flow-proxy`.
+*Docker Flow Proxy* can be configured through Docker environment variables and/or by creating a new image based on `dockerflow/docker-flow-proxy`.
 
 ## Environment Variables
 
@@ -31,7 +31,7 @@ The following environment variables can be used to configure the *Docker Flow Pr
 |EXTRA_FRONTEND     |Value will be added to the default `frontend` configuration. Multiple lines should be separated with comma (*,*).|
 |EXTRA_GLOBAL       |Value will be added to the default `global` configuration. Multiple lines should be separated with comma (*,*).|
 |HTTPS_ONLY         |If set to true, all requests to all services will be redirected to HTTPS.<br>**Example:** `true`<br>**Default Value:** `false`|
-|LISTENER_ADDRESS   |The address of the [Docker Flow: Swarm Listener](https://github.com/vfarcic/docker-flow-swarm-listener) used for automatic proxy configuration.<br>**Example:** `swarm-listener:8080`|
+|LISTENER_ADDRESS   |The address of the [Docker Flow: Swarm Listener](https://github.com/docker-flow/docker-flow-swarm-listener) used for automatic proxy configuration.<br>**Example:** `swarm-listener:8080`|
 PROXY_INSTANCE_NAME|The name of the proxy instance. Useful if multiple proxies are running inside a cluster.<br>**Default value:** `docker-flow`|
 |SERVICE_NAME       |The name of the service. It must be the same as the value of the `--name` argument used to create the proxy service. Used only in the *swarm* mode.<br>**Example:** `my-proxy`<br>**Default value:** `proxy`|
 |RELOAD_INTERVAL    |Defines the frequency (in milliseconds) between automatic config reloads from Swarm Listener.<br>**Default value:** `5000`|
@@ -40,7 +40,7 @@ PROXY_INSTANCE_NAME|The name of the proxy instance. Useful if multiple proxies a
 |SEPARATOR          |The character used to separate multiple values.<br>**Default value:** `,` (comma)|
 |SERVICE_DOMAIN_ALGO|The default algorithm applied to domain ACLs. It can be overwritten for a service through the `serviceDomainAlgo` parameter.<br>**Examples:**<br>`hdr(host)`: matches only if domain is the same as `serviceDomain`<br>`hdr_dom(host)`: matches the specified `serviceDomain` and any subdomain (a string either isolated or delimited by dots).<br>`req.ssl_sni`: matches Server Name TLS extension<br>**Default Value:** `hdr_beg(host)`|
 |SKIP_ADDRESS_VALIDATION|Whether to skip validating service address before reconfiguring the proxy.<br>**Example:** false<br>**Default value:** `true`|
-|SSL_BIND_CIPHERS   |Sets the default string describing the list of cipher algorithms ("cipher suite") that are negotiated during the SSL/TLS handshake for all "bind" lines which do not explicitly define theirs. The format of the string is defined in "man 1 ciphers" from OpenSSL man pages, and can be for instance a string such as `AES:ALL:!aNULL:!eNULL:+RC4:@STRENGTH`.<br>**Default value:** see [Dockerfile](https://github.com/vfarcic/docker-flow-proxy/blob/master/Dockerfile#L31)|
+|SSL_BIND_CIPHERS   |Sets the default string describing the list of cipher algorithms ("cipher suite") that are negotiated during the SSL/TLS handshake for all "bind" lines which do not explicitly define theirs. The format of the string is defined in "man 1 ciphers" from OpenSSL man pages, and can be for instance a string such as `AES:ALL:!aNULL:!eNULL:+RC4:@STRENGTH`.<br>**Default value:** see [Dockerfile](https://github.com/docker-flow/docker-flow-proxy/blob/master/Dockerfile#L31)|
 |SSL_BIND_OPTIONS   |Sets default ssl-options to force on all "bind" lines.<br>**Default value:** `no-sslv3`|
 |STATS_USER         |Username for the statistics page. If not set, stats will not be available. If both `STATS_USER` and `STATS_PASS` are set to `none`, statistics will be available without authentication.<br>**Example:** my-user<br>**Default value:** `admin`|
 |STATS_USER_ENV     |The name of the environment variable that holds the username for the statistics page.<br>**Example:** MY_USER<br>**Default value:** `STATS_USER`|
@@ -138,10 +138,10 @@ Please read the [Proxy Statistics](https://proxy.dockerflow.com/swarm-mode-auto/
 
 ## Custom Config
 
-The base HAProxy configuration can be found in [haproxy.tmpl](https://github.com/vfarcic/docker-flow-proxy/blob/master/haproxy.tmpl). It can be customized by creating a new image. An example *Dockerfile* is as follows.
+The base HAProxy configuration can be found in [haproxy.tmpl](https://github.com/docker-flow/docker-flow-proxy/blob/master/haproxy.tmpl). It can be customized by creating a new image. An example *Dockerfile* is as follows.
 
 ```
-FROM vfarcic/docker-flow-proxy
+FROM dockerflow/docker-flow-proxy
 COPY haproxy.tmpl /cfg/tmpl/haproxy.tmpl
 ```
 

docs/debugging.md

@@ -17,14 +17,14 @@ The examples that follow will show you how to enable *Docker Flow Proxy* debuggi
 !!! tip
     Feel free to skip this section if you already have a working Swarm cluster.
 
-We'll use the [swarm-cluster.sh](https://github.com/vfarcic/docker-flow-proxy/blob/master/scripts/swarm-cluster.sh) script from the [vfarcic/docker-flow-proxy](https://github.com/vfarcic/docker-flow-proxy) repository. It'll create a Swarm cluster based on three Docker Machine nodes.
+We'll use the [swarm-cluster.sh](https://github.com/docker-flow/docker-flow-proxy/blob/master/scripts/swarm-cluster.sh) script from the [docker-flow/docker-flow-proxy](https://github.com/docker-flow/docker-flow-proxy) repository. It'll create a Swarm cluster based on three Docker Machine nodes.
 
 !!! info
-	For the [swarm-cluster.sh](https://github.com/vfarcic/docker-flow-proxy/blob/master/scripts/swarm-cluster.sh) script to work, you are required to have Docker Machine installed on your system.
+	For the [swarm-cluster.sh](https://github.com/docker-flow/docker-flow-proxy/blob/master/scripts/swarm-cluster.sh) script to work, you are required to have Docker Machine installed on your system.
 
 ```bash
 curl -o swarm-cluster.sh \
-    https://raw.githubusercontent.com/vfarcic/docker-flow-proxy/master/scripts/swarm-cluster.sh
+    https://raw.githubusercontent.com/docker-flow/docker-flow-proxy/master/scripts/swarm-cluster.sh
 
 chmod +x swarm-cluster.sh
 
@@ -44,7 +44,7 @@ Now that we have a Swarm cluster, we can deploy *Docker Flow Proxy* stack togeth
 docker network create -d overlay proxy
 
 curl -o proxy.yml \
-    https://raw.githubusercontent.com/vfarcic/docker-flow-proxy/master/docker-compose-stack.yml
+    https://raw.githubusercontent.com/docker-flow/docker-flow-proxy/master/docker-compose-stack.yml
 
 docker stack deploy -c proxy.yml proxy
 
@@ -190,11 +190,11 @@ We deployed the `redis` stack and opened the port `6379`.
 
 It might take a while until the `redis` stack is deployed. Please use the `docker stack ps redis` to confirm that it is running.
 
-We'll use the [redis_check.sh](https://github.com/vfarcic/docker-flow-proxy/blob/master/integration_tests/redis_check.sh) script to send a TCP request to Redis through the proxy. The same script is used by *Docker Flow Proxy* automated tests.
+We'll use the [redis_check.sh](https://github.com/docker-flow/docker-flow-proxy/blob/master/integration_tests/redis_check.sh) script to send a TCP request to Redis through the proxy. The same script is used by *Docker Flow Proxy* automated tests.
 
 ```bash
 curl -o redis_check.sh \
-    https://raw.githubusercontent.com/vfarcic/docker-flow-proxy/master/scripts/redis_check.sh
+    https://raw.githubusercontent.com/docker-flow/docker-flow-proxy/master/scripts/redis_check.sh
 
 chmod +x redis_check.sh
 

docs/fdqn.md

@@ -3,13 +3,13 @@ docker network create --driver overlay proxy
 
 curl -o docker-compose-stack.yml \
     https://raw.githubusercontent.com/\
-vfarcic/docker-flow-proxy/master/docker-compose-stack.yml
+docker-flow/docker-flow-proxy/master/docker-compose-stack.yml
 
 docker stack deploy -c docker-compose-stack.yml proxy
 
 curl -o docker-compose-go-demo.yml \
     https://raw.githubusercontent.com/\
-vfarcic/go-demo/master/docker-compose-stack.yml
+docker-flow/go-demo/master/docker-compose-stack.yml
 
 docker stack deploy -c docker-compose-go-demo.yml go-demo
 

docs/feedback-and-contribution.md

@@ -8,7 +8,7 @@ The *Docker Flow Proxy* project welcomes, and depends, on contributions from dev
 
 ## Reporting an Issue
 
-Feel fee to [create a new issue](https://github.com/vfarcic/docker-flow-proxy/issues). Include as much detail as you can.
+Feel fee to [create a new issue](https://github.com/docker-flow/docker-flow-proxy/issues). Include as much detail as you can.
 
 If an issue is a bug, please provide steps to reproduce it.
 
@@ -28,7 +28,7 @@ Once you are finish implementing a new feature or fixing a bug, run the *Complet
 
 ### Repository
 
-Fork [docker-flow-proxy](https://github.com/vfarcic/docker-flow-proxy).
+Fork [docker-flow-proxy](https://github.com/docker-flow/docker-flow-proxy).
 
 ### Unit Testing
 
@@ -76,8 +76,8 @@ docker-compose -f docker-compose-test.yml run --rm staging-swarm
 
 #### Through Jenkins
 
-Make a PR and let Jenkins do the work. You can monitor the status from the Jenkins job [Viktor Farcic / docker-flow-proxy](http://jenkins.dockerflow.com/blue/organizations/jenkins/vfarcic%2Fdocker-flow-proxy/activity).
+Make a PR and let Jenkins do the work. You can monitor the status from the Jenkins job [Viktor Farcic / docker-flow-proxy](http://jenkins.dockerflow.com/blue/organizations/jenkins/docker-flow%2Fdocker-flow-proxy/activity).
 
-Please [create an issue](https://github.com/vfarcic/docker-flow-proxy/issues) if you'd like to add your repository to the builds.
+Please [create an issue](https://github.com/docker-flow/docker-flow-proxy/issues) if you'd like to add your repository to the builds.
 
 

docs/index.md

@@ -1,9 +1,9 @@
 # Docker Flow Proxy
 
-[![GitHub release](https://img.shields.io/github/release/vfarcic/docker-flow-proxy.svg)]()
-[![license](https://img.shields.io/github/license/vfarcic/docker-flow-proxy.svg)]()
-[![Docker Pulls](https://img.shields.io/docker/pulls/vfarcic/docker-flow-proxy.svg)]()
-[![Go Report Card](https://goreportcard.com/badge/github.com/vfarcic/docker-flow-proxy)](https://goreportcard.com/report/github.com/vfarcic/docker-flow-proxy)
+[![GitHub release](https://img.shields.io/github/release/docker-flow/docker-flow-proxy.svg)]()
+[![license](https://img.shields.io/github/license/docker-flow/docker-flow-proxy.svg)]()
+[![Docker Pulls](https://img.shields.io/docker/pulls/docker-flow/docker-flow-proxy.svg)]()
+[![Go Report Card](https://goreportcard.com/badge/github.com/docker-flow/docker-flow-proxy)](https://goreportcard.com/report/github.com/docker-flow/docker-flow-proxy)
 
 The goal of the *Docker Flow Proxy* project is to provide an easy way to reconfigure proxy every time a new service is deployed, or when a service is scaled. It does not try to "reinvent the wheel", but to leverage the existing leaders and combine them through an easy to use integration. It uses [HAProxy](http://www.haproxy.org/) as a proxy and adds custom logic that allows on-demand reconfiguration.