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.

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

Use /cert less images, newer hook and some more docker-compose clean ups. #141

Merged
merged 12 commits into from
Jun 23, 2022

Commits on Jun 2, 2022

  1. nix: Update nixpkgs to get updated docker-compose

    Without this docker-compose complains about depends_on config settings:
    
    > ERROR: The Compose file './docker-compose.yml' is invalid because:
    > services.tink-server.depends_on.generate-tls-certs.condition contains "service_completed_successfully", which is an invalid type, it should be a service_started, or a service_healthy
    > services.web-assets-server.depends_on.fetch-and-convert-ubuntu-img.condition contains "service_completed_successfully", which is an invalid type, it should be a service_started, or a service_healthy
    > services.registry.depends_on.generate-tls-certs.condition contains "service_completed_successfully", which is an invalid type, it should be a service_started, or a service_healthy
    
    This was due to docker/compose#8154.
    
    Signed-off-by: Manuel Mendez <[email protected]>
    mmlb committed Jun 2, 2022
    Configuration menu
    Copy the full SHA
    69c8863 View commit details
    Browse the repository at this point in the history

Commits on Jun 21, 2022

  1. setup.sh: Add a message when setup.sh is all done

    It is hard to tell when setup.sh is done in vagrant without having to
    read/parse the output to figure out if we're at the last step. This change
    makes it obvious. Its not so necessary for terraform but I'd like to keep
    both scripts about as similar as possible.
    
    Signed-off-by: Manuel Mendez <[email protected]>
    mmlb committed Jun 21, 2022
    Configuration menu
    Copy the full SHA
    3258e68 View commit details
    Browse the repository at this point in the history
  2. compose: Change tink healthcheck endpoint to healthz

    cert is going away and was never really a good one anyway.
    
    Signed-off-by: Manuel Mendez <[email protected]>
    mmlb committed Jun 21, 2022
    Configuration menu
    Copy the full SHA
    5242da8 View commit details
    Browse the repository at this point in the history
  3. compose: Tidy double-quotes so they are only used where necessary

    Don't need quotes for strings in yaml dicts (512M is a string due to the M)
    and we definitely want them whenever they appear in a shell command.
    
    Signed-off-by: Manuel Mendez <[email protected]>
    mmlb committed Jun 21, 2022
    Configuration menu
    Copy the full SHA
    f78e60a View commit details
    Browse the repository at this point in the history
  4. compose: Specify boots listen addresses only once

    To avoid confusion between the environment and cli params.
    
    Signed-off-by: Manuel Mendez <[email protected]>
    mmlb committed Jun 21, 2022
    Configuration menu
    Copy the full SHA
    8db484a View commit details
    Browse the repository at this point in the history
  5. compose: Update boots/hegel/tink* container images to latest sha

    Added TINKERBELL_TLS (default false) since self-signed certs are going to
    cause tink-worker to fail to connect.
    
    Signed-off-by: Manuel Mendez <[email protected]>
    mmlb committed Jun 21, 2022
    Configuration menu
    Copy the full SHA
    f3bae0d View commit details
    Browse the repository at this point in the history
  6. compose: Drop useless env vars

    These are no longer needed (some never were) so we lets drop them.
    
    Signed-off-by: Manuel Mendez <[email protected]>
    mmlb committed Jun 21, 2022
    Configuration menu
    Copy the full SHA
    b8d102e View commit details
    Browse the repository at this point in the history

Commits on Jun 22, 2022

  1. compose: Keep versions in variables for DRYness

    This way we can be sure that all the versions are kept in sync easily.
    
    Signed-off-by: Manuel Mendez <[email protected]>
    mmlb committed Jun 22, 2022
    Configuration menu
    Copy the full SHA
    415b8d0 View commit details
    Browse the repository at this point in the history
  2. compose: Move configurable env vars to .env (also for DRYness)

    Lets make .env the central/source-of-truth for env configuration. This
    means we don't have to deal with empty vars and default values all over the
    docker-compose.yml file. This does not cause any change in treatment of
    environment variables. Actual environment variables still supersede those set
    in .env. The values in .env are thus just the default if left unspecified,
    exactly like ${VAR:-default} in the docker-compose.yml file.
    
    I also got rid of container configs that used the `environment` config to
    inject the env vars so that the `command` can use it. Having the values
    in the environment would only really be useful if we expect to `exec`
    into the container and run some commands. I haven't needed to do that yet
    so would rather avoid repetition until absoulutely necessary. We can just
    have docker-compose inject the values directly into the `command` line.
    
    Signed-off-by: Manuel Mendez <[email protected]>
    mmlb committed Jun 22, 2022
    Configuration menu
    Copy the full SHA
    be25d40 View commit details
    Browse the repository at this point in the history
  3. compose: Use just one form to reference env vars

    ${} isn't actually needed in any of these uses so lets just use the shorter form.
    
    Signed-off-by: Manuel Mendez <[email protected]>
    mmlb committed Jun 22, 2022
    Configuration menu
    Copy the full SHA
    3a2cc36 View commit details
    Browse the repository at this point in the history
  4. compose: Specify the same version of tink-worker as tink-serve and ti…

    …nk-cli to hook
    
    This way all the tink images are in sync and managed in just one place
    (the .env file).
    
    Signed-off-by: Manuel Mendez <[email protected]>
    mmlb committed Jun 22, 2022
    Configuration menu
    Copy the full SHA
    b3134e7 View commit details
    Browse the repository at this point in the history
  5. compose: Use Hook v0.7.0

    This has a bunch of linuxkit updates and more recent container images that have
    dropped /cert support.
    
    Signed-off-by: Manuel Mendez <[email protected]>
    mmlb committed Jun 22, 2022
    Configuration menu
    Copy the full SHA
    8ef2b10 View commit details
    Browse the repository at this point in the history