Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

ensure it's easy to customize advertised addy's etc with docker #1177

Merged
merged 69 commits into from
Jul 12, 2023
Merged

ensure it's easy to customize advertised addy's etc with docker #1177

merged 69 commits into from
Jul 12, 2023

Commits on Jun 27, 2023

  1. add a var to quiet _setup_ziti_network logging too much

    @dovholuknf
    dovholuknf committed Jun 27, 2023
    Configuration menu
    Copy the full SHA
    9d4c604 View commit details
    Browse the repository at this point in the history

  2. small tweak to Dockerfile

    @dovholuknf
    dovholuknf committed Jun 27, 2023
    Configuration menu
    Copy the full SHA
    7ba125f View commit details
    Browse the repository at this point in the history

  3. fix run-controller.sh

    @dovholuknf
    dovholuknf committed Jun 27, 2023
    Configuration menu
    Copy the full SHA
    ba63ade View commit details
    Browse the repository at this point in the history

Commits on Jun 28, 2023

  1. update run-router

    @dovholuknf
    dovholuknf committed Jun 28, 2023
    Configuration menu
    Copy the full SHA
    5f25290 View commit details
    Browse the repository at this point in the history

  2. unset user/pwd from docker container after logging in

    @dovholuknf
    dovholuknf committed Jun 28, 2023
    Configuration menu
    Copy the full SHA
    ede9d7e View commit details
    Browse the repository at this point in the history

  3. more changes to run-*sh

    @dovholuknf
    dovholuknf committed Jun 28, 2023
    Configuration menu
    Copy the full SHA
    3a1178e View commit details
    Browse the repository at this point in the history

  4. updates to simplified-docker and var rename

    @dovholuknf
    dovholuknf committed Jun 28, 2023
    Configuration menu
    Copy the full SHA
    092c0ae View commit details
    Browse the repository at this point in the history

  5. remove quotes

    @dovholuknf
    dovholuknf committed Jun 28, 2023
    Configuration menu
    Copy the full SHA
    c3357bc View commit details
    Browse the repository at this point in the history

  6. missed quotes

    @dovholuknf
    dovholuknf committed Jun 28, 2023
    Configuration menu
    Copy the full SHA
    82d030d View commit details
    Browse the repository at this point in the history

  7. missed a colon too

    @dovholuknf
    dovholuknf committed Jun 28, 2023
    Configuration menu
    Copy the full SHA
    59792f5 View commit details
    Browse the repository at this point in the history

  8. and another quote

    @dovholuknf
    dovholuknf committed Jun 28, 2023
    Configuration menu
    Copy the full SHA
    7aa5eb3 View commit details
    Browse the repository at this point in the history

  9. clear up hardcoded name and add default

    @dovholuknf
    dovholuknf committed Jun 28, 2023
    Configuration menu
    Copy the full SHA
    586af15 View commit details
    Browse the repository at this point in the history

  10. remove unused variable for router

    @dovholuknf
    dovholuknf committed Jun 28, 2023
    Configuration menu
    Copy the full SHA
    7871b90 View commit details
    Browse the repository at this point in the history

  11. add more default values to compose file

    @dovholuknf
    dovholuknf committed Jun 28, 2023
    Configuration menu
    Copy the full SHA
    83f933c View commit details
    Browse the repository at this point in the history

  12. turns out to be used...

    @dovholuknf
    dovholuknf committed Jun 28, 2023
    Configuration menu
    Copy the full SHA
    7104fc1 View commit details
    Browse the repository at this point in the history

Commits on Jun 29, 2023

  1. hopefully the last few rounds of changes

    @dovholuknf
    dovholuknf committed Jun 29, 2023
    Configuration menu
    Copy the full SHA
    04a671b View commit details
    Browse the repository at this point in the history

  2. zac misnamed default

    @dovholuknf
    dovholuknf committed Jun 29, 2023
    Configuration menu
    Copy the full SHA
    3c69ed5 View commit details
    Browse the repository at this point in the history

  3. add createLocalImage.sh to recreate the latest quickstart image. usef… 

    …ul when debugging the container scripts without having to rebuild the binaries and adapt the pushLatestDocker.sh to accomodate locally 'pushed' images
    @dovholuknf
    dovholuknf committed Jun 29, 2023
    Configuration menu
    Copy the full SHA
    dd20444 View commit details
    Browse the repository at this point in the history

  4. Fixing router config ctrl listener address 

    Changing listener variable names to use the term advertised

Signed-off-by: gberl002 <[email protected]>
    gberl002 committed Jun 29, 2023
    Configuration menu
    Copy the full SHA
    9a32d8d View commit details
    Browse the repository at this point in the history

  5. add gitignore, remove more unused files. update dockerfile comment

    @dovholuknf
    dovholuknf committed Jun 29, 2023
    Configuration menu
    Copy the full SHA
    ba1ee41 View commit details
    Browse the repository at this point in the history

  6. Merging latest from base branch

    gberl002 committed Jun 29, 2023
    Configuration menu
    Copy the full SHA
    2482af5 View commit details
    Browse the repository at this point in the history

  7. Adding ZITI_CTRL_BIND_ADDRESS for the ctrl.listener address of the co… 

    …ntroller config.

Signed-off-by: gberl002 <[email protected]>
    gberl002 committed Jun 29, 2023
    Configuration menu
    Copy the full SHA
    dcfb641 View commit details
    Browse the repository at this point in the history

  8. update readme

    @dovholuknf
    dovholuknf committed Jun 29, 2023
    Configuration menu
    Copy the full SHA
    08942b9 View commit details
    Browse the repository at this point in the history

  9. Small description clarification 

    Signed-off-by: gberl002 <[email protected]>
    gberl002 committed Jun 29, 2023
    Configuration menu
    Copy the full SHA
    c8ed4fb View commit details
    Browse the repository at this point in the history

  10. forgot the cp step

    @dovholuknf
    dovholuknf committed Jun 29, 2023
    Configuration menu
    Copy the full SHA
    7003580 View commit details
    Browse the repository at this point in the history

  11. Merge pull request #1181 from openziti/add-ctrl-address 

    Fix router to ctrl address and update names
    @dovholuknf
    dovholuknf authored Jun 29, 2023
    Configuration menu
    Copy the full SHA
    f0eb80a View commit details
    Browse the repository at this point in the history

  12. minor improvment to readme

    @dovholuknf
    dovholuknf committed Jun 29, 2023
    Configuration menu
    Copy the full SHA
    8b9ddcd View commit details
    Browse the repository at this point in the history

  13. Inverting binary result 

    Signed-off-by: gberl002 <[email protected]>
    gberl002 committed Jun 29, 2023
    Configuration menu
    Copy the full SHA
    6298bad View commit details
    Browse the repository at this point in the history

Commits on Jun 30, 2023

  1. update quickstart test to allow env vars setting. update docker compo… 

    …se and simplified compose
    @dovholuknf
    dovholuknf committed Jun 30, 2023
    Configuration menu
    Copy the full SHA
    e35d2d3 View commit details
    Browse the repository at this point in the history

  2. add warning to let people know they aren't overriding the ziti cli wi… 

    …th a built version
    @dovholuknf
    dovholuknf committed Jun 30, 2023
    Configuration menu
    Copy the full SHA
    34ff8ab View commit details
    Browse the repository at this point in the history

  3. continue to tweak messaging

    @dovholuknf
    dovholuknf committed Jun 30, 2023
    Configuration menu
    Copy the full SHA
    fbfb917 View commit details
    Browse the repository at this point in the history

Commits on Jul 1, 2023

  1. updates to create controller cfg

    @dovholuknf
    dovholuknf committed Jul 1, 2023
    Configuration menu
    Copy the full SHA
    36868dd View commit details
    Browse the repository at this point in the history

  2. remove ziti-router that was missed and remove stray text from test

    @dovholuknf
    dovholuknf committed Jul 1, 2023
    Configuration menu
    Copy the full SHA
    78628b0 View commit details
    Browse the repository at this point in the history

  3. allow alt server certs on edge controller

    @dovholuknf
    dovholuknf committed Jul 1, 2023
    Configuration menu
    Copy the full SHA
    127391f View commit details
    Browse the repository at this point in the history

Commits on Jul 3, 2023

  1. allow the user to be specified

    @dovholuknf
    dovholuknf committed Jul 3, 2023
    Configuration menu
    Copy the full SHA
    84b336f View commit details
    Browse the repository at this point in the history

  2. change back to literals from constants

    @dovholuknf
    dovholuknf committed Jul 3, 2023
    Configuration menu
    Copy the full SHA
    ccbc8a1 View commit details
    Browse the repository at this point in the history

  3. remove sudo

    @dovholuknf
    dovholuknf committed Jul 3, 2023
    Configuration menu
    Copy the full SHA
    d8e8058 View commit details
    Browse the repository at this point in the history

  4. remove test file

    @dovholuknf
    dovholuknf committed Jul 3, 2023
    Configuration menu
    Copy the full SHA
    6b03500 View commit details
    Browse the repository at this point in the history

  5. CtrlPkiAltServerCert -> PkiAltServerCert. add alt server certs to cre… 

    …ate router config. add test
    @dovholuknf
    dovholuknf committed Jul 3, 2023
    Configuration menu
    Copy the full SHA
    b48274b View commit details
    Browse the repository at this point in the history

Commits on Jul 4, 2023

  1. Fixing some tests 

    Signed-off-by: gberl002 <[email protected]>
    gberl002 committed Jul 4, 2023
    Configuration menu
    Copy the full SHA
    fd9a3a4 View commit details
    Browse the repository at this point in the history

  2. Merge pull request #1190 from openziti/update_tests 

    Fixing some tests
    @gberl002
    gberl002 authored Jul 4, 2023
    Configuration menu
    Copy the full SHA
    a535594 View commit details
    Browse the repository at this point in the history

Commits on Jul 5, 2023

  1. further refinements to tests and alt server certs

    @dovholuknf
    dovholuknf committed Jul 5, 2023
    Configuration menu
    Copy the full SHA
    e976c14 View commit details
    Browse the repository at this point in the history

  2. fix tests

    @dovholuknf
    dovholuknf committed Jul 5, 2023
    Configuration menu
    Copy the full SHA
    0985f63 View commit details
    Browse the repository at this point in the history

  3. use proper name for env var

    @dovholuknf
    dovholuknf committed Jul 5, 2023
    Configuration menu
    Copy the full SHA
    d747b74 View commit details
    Browse the repository at this point in the history

  4. align advertised and bindpoint addresses as necessary

    @dovholuknf
    dovholuknf committed Jul 5, 2023
    Configuration menu
    Copy the full SHA
    2089a10 View commit details
    Browse the repository at this point in the history

  5. apply alt server certs to root identity section as well

    @dovholuknf
    dovholuknf committed Jul 5, 2023
    Configuration menu
    Copy the full SHA
    a13ea07 View commit details
    Browse the repository at this point in the history

Commits on Jul 6, 2023

  1. don't recreate everything everytime

    @dovholuknf
    dovholuknf committed Jul 6, 2023
    Configuration menu
    Copy the full SHA
    45c40c7 View commit details
    Browse the repository at this point in the history

  2. don't reinit edge router either if marker file found

    @dovholuknf
    dovholuknf committed Jul 6, 2023
    Configuration menu
    Copy the full SHA
    ad40509 View commit details
    Browse the repository at this point in the history

  3. add hostname to the init file in case someone removes the actual cont… 

    …ainer for whatever reason...
    @dovholuknf
    dovholuknf committed Jul 6, 2023
    Configuration menu
    Copy the full SHA
    995f64d View commit details
    Browse the repository at this point in the history

  4. align values because it looks nicer

    @dovholuknf
    dovholuknf committed Jul 6, 2023
    Configuration menu
    Copy the full SHA
    e05923f View commit details
    Browse the repository at this point in the history

  5. change to env var sourcing. if set, don't stop

    @dovholuknf
    dovholuknf committed Jul 6, 2023
    Configuration menu
    Copy the full SHA
    ca5cf11 View commit details
    Browse the repository at this point in the history

  6. missed the $ sign

    @dovholuknf
    dovholuknf committed Jul 6, 2023
    Configuration menu
    Copy the full SHA
    e5ddb65 View commit details
    Browse the repository at this point in the history

  7. and add the missing export

    @dovholuknf
    dovholuknf committed Jul 6, 2023
    Configuration menu
    Copy the full SHA
    f86fb62 View commit details
    Browse the repository at this point in the history

  8. allow csr section to be overridden

    @dovholuknf
    dovholuknf committed Jul 6, 2023
    Configuration menu
    Copy the full SHA
    3d0895e View commit details
    Browse the repository at this point in the history

  9. add alt address

    @dovholuknf
    dovholuknf committed Jul 6, 2023
    Configuration menu
    Copy the full SHA
    931568e View commit details
    Browse the repository at this point in the history

  10. refactor ZITI_EDGE_ROUTER to just ZITI_ROUTER. refactor and comment o… 

    …ut alt_server_certs to make it easy to update after generating from template
    @dovholuknf
    dovholuknf committed Jul 6, 2023
    Configuration menu
    Copy the full SHA
    ff50afb View commit details
    Browse the repository at this point in the history

Commits on Jul 7, 2023

  1. fix wss port and remove redundant test setup calls

    @dovholuknf
    dovholuknf committed Jul 7, 2023
    Configuration menu
    Copy the full SHA
    dcdbad5 View commit details
    Browse the repository at this point in the history

  2. add alt certs to the ws section too

    @dovholuknf
    dovholuknf committed Jul 7, 2023
    Configuration menu
    Copy the full SHA
    8fb0182 View commit details
    Browse the repository at this point in the history

  3. update wss router with alt certs

    @dovholuknf
    dovholuknf committed Jul 7, 2023
    Configuration menu
    Copy the full SHA
    e6f8036 View commit details
    Browse the repository at this point in the history

Commits on Jul 8, 2023

  1. Fixing printing of literal newline char 

    Signed-off-by: gberl002 <[email protected]>
    gberl002 committed Jul 8, 2023
    Configuration menu
    Copy the full SHA
    9126451 View commit details
    Browse the repository at this point in the history

Commits on Jul 10, 2023

  1. Flipping boolean result again, fixing formatting issue 

    Signed-off-by: gberl002 <[email protected]>
    gberl002 committed Jul 10, 2023
    Configuration menu
    Copy the full SHA
    f3760e2 View commit details
    Browse the repository at this point in the history

Commits on Jul 11, 2023

  1. allow the CSR section of the router to be configured separately from … 

    …the _advertised_ address
    @dovholuknf
    dovholuknf committed Jul 11, 2023
    Configuration menu
    Copy the full SHA
    7094f5d View commit details
    Browse the repository at this point in the history

Commits on Jul 12, 2023

  1. remove unused file

    @dovholuknf
    dovholuknf committed Jul 12, 2023
    Configuration menu
    Copy the full SHA
    884d8d9 View commit details
    Browse the repository at this point in the history

  2. remove another unused file

    @dovholuknf
    dovholuknf committed Jul 12, 2023
    Configuration menu
    Copy the full SHA
    14c7d02 View commit details
    Browse the repository at this point in the history

  3. small tweaks based on review/writing changelog. write changelog

    @dovholuknf
    dovholuknf committed Jul 12, 2023
    Configuration menu
    Copy the full SHA
    bf0ab44 View commit details
    Browse the repository at this point in the history

  4. Unsetting custom variable for reentrant capability 

    Signed-off-by: gberl002 <[email protected]>
    gberl002 committed Jul 12, 2023
    Configuration menu
    Copy the full SHA
    d4b34d3 View commit details
    Browse the repository at this point in the history

  5. remove extra changelog

    @dovholuknf
    dovholuknf committed Jul 12, 2023
    Configuration menu
    Copy the full SHA
    151eece View commit details
    Browse the repository at this point in the history

  6. fix net -> new typo

    @dovholuknf
    dovholuknf committed Jul 12, 2023
    Configuration menu
    Copy the full SHA
    fcd336b View commit details
    Browse the repository at this point in the history

  7. Merge branch 'release-next' into customized-docker

    @dovholuknf
    dovholuknf authored Jul 12, 2023
    Configuration menu
    Copy the full SHA
    e6307ad View commit details
    Browse the repository at this point in the history