Bring back docker image#1211
Merged
Merged
Conversation
6995290 to
0a3143e
Compare
…t's try this instead
0a3143e to
6d93b65
Compare
david-crespo
commented
Jun 15, 2022
Comment on lines
+19
to
+28
| RUN apt-get update && apt-get install -y \ | ||
| libpq-dev \ | ||
| pkg-config \ | ||
| xmlsec1 \ | ||
| libxmlsec1-dev \ | ||
| libxmlsec1-openssl \ | ||
| libclang-dev \ | ||
| libsqlite3-dev \ | ||
| --no-install-recommends \ | ||
| && rm -rf /var/lib/apt/lists/* |
Contributor
Author
There was a problem hiding this comment.
adding this is the only change from the old Dockerfile
Contributor
|
Thanks for bringing this back! I think adding those two to Can you try adding |
david-crespo
commented
Jun 17, 2022
| password: ${{ secrets.GITHUB_TOKEN }} | ||
| - name: Extract branch name | ||
| shell: bash | ||
| run: echo "##[set-output name=branch;]$(echo ${GITHUB_REF_NAME//\//-})" |
Contributor
Author
There was a problem hiding this comment.
this was changed to fix a bug where it was tagging these images as main
david-crespo
commented
Jun 17, 2022
| # sudo and path thing are only needed to get prereqs script to run | ||
| ENV PATH=/usr/src/omicron/out/cockroachdb/bin:/usr/src/omicron/out/clickhouse:${PATH} | ||
| RUN apt-get update && apt-get install -y sudo --no-install-recommends && rm -rf /var/lib/apt/lists/* | ||
| RUN tools/install_prerequisites.sh -y |
Contributor
Author
There was a problem hiding this comment.
this was added vs. the original Dockerfile
This was referenced Jul 9, 2022
Merged
leftwo
added a commit
that referenced
this pull request
Mar 29, 2024
Propolis changes: Add `IntrPin::import_state` and migrate LPC UART pin states (#669) Attempt to set WCE for raw file backends Fix clippy/lint nits for rust 1.77.0 Crucible changes: Correctly (and robustly) count bytes (#1237) test-replay.sh fix name of DTrace script (#1235) BlockReq -> BlockOp (#1234) Simplify `BlockReq` (#1218) DTrace, cmon, cleanup, retry downstairs connections at 10 seconds. (#1231) Remove `MAX_ACTIVE_COUNT` flow control system (#1217) Crucible changes that were in Omicron but not in Propolis before this commit. Return *410 Gone* if volume is inactive (#1232) Update Rust crate opentelemetry to 0.22.0 (#1224) Update Rust crate base64 to 0.22.0 (#1222) Update Rust crate async-recursion to 1.1.0 (#1221) Minor cleanups to extent implementations (#1230) Update Rust crate http to 0.2.12 (#1220) Update Rust crate reedline to 0.30.0 (#1227) Update Rust crate rayon to 1.9.0 (#1226) Update Rust crate nix to 0.28 (#1223) Update Rust crate async-trait to 0.1.78 (#1219) Various buffer optimizations (#1211) Add low-level test for message encoding (#1214) Don't let df failures ruin the buildomat tests (#1213) Activate the NBD server's psuedo file (#1209) --------- Co-authored-by: Alan Hanson <alan@oxide.computer>
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Turns out the CLI needs it for testing, plus @karencfv will also be using it for testing Terraform.
Here's the diff between this branch and the commit before the one where I deleted the Dockerfile: a09934d...undelete-docker. The only difference from the original versions of these files (the Dockerfile and the GH workflow file) is that I added a
apt-get installline beforecargo build.The natural thing would be to run
tools/install_prerequesites.shthere instead, but I couldn't get that to work for a couple of reasons. First, it doesn't like thesudocommands —sudois not available by default. Getting rid of the sudos made it get farther (CI run) but then it failed on something else:Not sure what to do about that.
In any case, to prove it can work, I have instead taken
install_prerequisites.shback out of the Dockerfile and instead manually copied in the packages it installs into an explicitapt-get installin the Dockerfile. That works, though it is of course brittle because it doesn't automatically bring in packages as they're added to the prereqs script. There are also probably more packages being installed than we actually need.