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

Build nginz and nginz_disco docker images using nix, too #2796

Merged
merged 18 commits into from
Nov 8, 2022

Conversation

jschaul
Copy link
Member

@jschaul jschaul commented Oct 24, 2022

TODO before merging:

Checklist

  • Add a new entry in an appropriate subdirectory of changelog.d
  • Read and follow the PR guidelines

@jschaul jschaul temporarily deployed to cachix October 24, 2022 18:42 Inactive
@zebot zebot added the ok-to-test Approved for running tests in CI, overrides not-ok-to-test if both labels exist label Oct 24, 2022
@jschaul jschaul force-pushed the nixify-nginz-image branch from c56c6a5 to 3d78283 Compare October 25, 2022 16:26
@jschaul jschaul temporarily deployed to cachix October 25, 2022 16:26 Inactive
@jschaul jschaul temporarily deployed to cachix October 26, 2022 13:06 Inactive
@jschaul jschaul force-pushed the nixify-nginz-image branch from 01024eb to 0791a36 Compare October 26, 2022 13:08
@jschaul jschaul temporarily deployed to cachix October 26, 2022 13:08 Inactive
@jschaul jschaul temporarily deployed to cachix October 26, 2022 14:46 Inactive
@jschaul jschaul temporarily deployed to cachix October 26, 2022 14:55 Inactive
@jschaul jschaul force-pushed the nixify-nginz-image branch from 54ebac0 to fb95685 Compare October 27, 2022 20:35
@jschaul jschaul temporarily deployed to cachix October 27, 2022 20:35 Inactive
@jschaul jschaul changed the title WIP Build nginz and nginz_disco using nix, too Oct 27, 2022
@jschaul jschaul changed the title Build nginz and nginz_disco using nix, too Build nginz and nginz_disco docker images using nix, too Oct 27, 2022
nix/nginz.nix Outdated Show resolved Hide resolved
@jschaul jschaul force-pushed the nixify-nginz-image branch from fb95685 to a9127a6 Compare November 1, 2022 13:22
@jschaul jschaul temporarily deployed to cachix November 1, 2022 13:22 Inactive
@jschaul jschaul force-pushed the nixify-nginz-image branch from a9127a6 to 1297fc2 Compare November 1, 2022 13:31
@jschaul jschaul temporarily deployed to cachix November 1, 2022 13:31 Inactive
@jschaul jschaul temporarily deployed to cachix November 1, 2022 13:33 Inactive
@flokli
Copy link
Contributor

flokli commented Nov 2, 2022

What's the status of this? Still a draft, or ready to review?

@jschaul jschaul temporarily deployed to cachix November 3, 2022 13:35 Inactive
@jschaul jschaul requested a review from flokli November 3, 2022 13:37
@jschaul jschaul marked this pull request as ready for review November 3, 2022 13:38
nix/nginz.nix Outdated Show resolved Hide resolved
};
};
in
nginzImage
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This hides away the individual binaries, but it's a problem we also have with the haskell binaries, so happy to tackle this in a followup PR.

nix/nginz.nix Outdated Show resolved Hide resolved
nix/nginz.nix Outdated Show resolved Hide resolved
@jschaul jschaul temporarily deployed to cachix November 3, 2022 14:58 Inactive
@flokli flokli temporarily deployed to cachix November 3, 2022 15:28 Inactive
@flokli flokli temporarily deployed to cachix November 3, 2022 15:32 Inactive
@jschaul jschaul force-pushed the nixify-nginz-image branch from ff90a61 to 09b10ac Compare November 8, 2022 11:45
@jschaul jschaul temporarily deployed to cachix November 8, 2022 11:45 Inactive
@jschaul
Copy link
Member Author

jschaul commented Nov 8, 2022

With #2828 merged, can we rebase this (and remove the openssl_1_1 overrides)?

Done.

@jschaul jschaul merged commit de6ebb6 into develop Nov 8, 2022
@jschaul jschaul deleted the nixify-nginz-image branch November 8, 2022 15:32
supersven pushed a commit that referenced this pull request Nov 22, 2022
* WIP

* make inputs explicit

* fixup for paths

* use alpine base image

* Support from flokli to fix issues

* formatting

* add nixified nginz-disco image

* attempt to add to default.nix

* nginx: [warn] could not build optimal variables_hash, you should increase either variables_hash_max_size: 1024 or variables_hash_bucket_size: 64; ignoring variables_hash_bucket_size

* PR feedback: openssl 1.1

* changelog

* also upload nginz and nginz-disco images

* PR feedback

* nix/nginz.nix: add nginz to contents

cannon has a preStop lifecycle hook that currently invokes nginx -c …
quit on stop.

* nginz container: drop exposed ports

All config is defined in the helm chart, just by building the container
we don't know which ports are exposed.

* services/nginz: drop Dockerfile, README and Makefile

We use Nix to build this now.

* Hi CI

* remove no-longer-necessary openssl1.1 override

Co-authored-by: Florian Klink <flokli@flokli.de>
battermann pushed a commit that referenced this pull request Dec 12, 2022
* WIP

* make inputs explicit

* fixup for paths

* use alpine base image

* Support from flokli to fix issues

* formatting

* add nixified nginz-disco image

* attempt to add to default.nix

* nginx: [warn] could not build optimal variables_hash, you should increase either variables_hash_max_size: 1024 or variables_hash_bucket_size: 64; ignoring variables_hash_bucket_size

* PR feedback: openssl 1.1

* changelog

* also upload nginz and nginz-disco images

* PR feedback

* nix/nginz.nix: add nginz to contents

cannon has a preStop lifecycle hook that currently invokes nginx -c …
quit on stop.

* nginz container: drop exposed ports

All config is defined in the helm chart, just by building the container
we don't know which ports are exposed.

* services/nginz: drop Dockerfile, README and Makefile

We use Nix to build this now.

* Hi CI

* remove no-longer-necessary openssl1.1 override

Co-authored-by: Florian Klink <flokli@flokli.de>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
ok-to-test Approved for running tests in CI, overrides not-ok-to-test if both labels exist
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants