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

Add the SQLite CLI for augur merge #232

Merged
merged 1 commit into from
Sep 5, 2024
Merged

Add the SQLite CLI for augur merge #232

merged 1 commit into from
Sep 5, 2024

Conversation

tsibley
Copy link
Member

@tsibley tsibley commented Sep 4, 2024

Ideally this would have been added before or as Augur 25.3.0—the first version to include augur merge—was packaged into this runtime, but I plain forgot.

Checklist

  • Checks pass

@tsibley
Copy link
Member Author

tsibley commented Sep 4, 2024

Oh, ugh. Our images are based on Debian Bullseye (currently "oldstable"), which packages SQLite 3.34, but augur merge requires ≥3.39. Phooey.

I can either

  1. Upgrade image base to Debian Bookworm (currently "stable"), which packages 3.40. We'll eventually want to do this anyway, but it's a much more wide reaching change and potentially not trivial.
  2. Install an appropriate SQLite version from elsewhere, either binaries or compiled from source.

@tsibley
Copy link
Member Author

tsibley commented Sep 4, 2024

Throwing #233 (option 1) at the wall to see what sticks.

@tsibley
Copy link
Member Author

tsibley commented Sep 4, 2024

Option 2 probably looks something like this:

diff --git a/Dockerfile b/Dockerfile
index e804b8c..0af2117 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -109,6 +109,17 @@ RUN curl -fsSL https://api.github.com/repos/vcftools/vcftools/tarball/1cab5204eb
  && cp -rp built/bin/*    /final/bin \
  && cp -rp built/share/*  /final/share
 
+# Build SQLite CLI
+WORKDIR /build/sqlite
+RUN curl -fsSL --proto 'https=' https://sqlite.org/2024/sqlite-autoconf-3460100.tar.gz \
+  | tar xzvpf - --no-same-owner --strip-components=1 \
+ && CFLAGS="-Os" ./configure --prefix=$PWD/built \
+      --build=$(TARGETPLATFORM= xx-clang --print-target-triple) \
+      --host=$(xx-clang --print-target-triple) \
+ && make && make install \
+ && cp -rp built/bin/*    /final/bin \
+ && cp -rp built/share/*  /final/share
+
 
 # 2. Download pre-built programs
 

@tsibley tsibley force-pushed the trs/sqlite-cli branch 2 times, most recently from 1c2a6d6 to 94cb0ec Compare September 4, 2024 19:39
@tsibley tsibley changed the base branch from master to trs/debian-bookworm September 4, 2024 19:40
@tsibley tsibley force-pushed the trs/debian-bookworm branch from 4d2c0c6 to b7bc9b9 Compare September 4, 2024 20:09
@tsibley tsibley marked this pull request as draft September 5, 2024 05:27
@tsibley tsibley force-pushed the trs/debian-bookworm branch from b7bc9b9 to b8c98e8 Compare September 5, 2024 05:40
@tsibley tsibley force-pushed the trs/sqlite-cli branch 2 times, most recently from b0992c0 to eca3433 Compare September 5, 2024 06:34
@tsibley tsibley force-pushed the trs/debian-bookworm branch from b8c98e8 to 97d6efc Compare September 5, 2024 06:34
@tsibley
Copy link
Member Author

tsibley commented Sep 5, 2024

Option 1 in #233 is going to work, it seems, without too much additional effort (and it's effort we'd want/need to do eventually anyway).

@tsibley tsibley marked this pull request as ready for review September 5, 2024 06:40
Ideally this would have been added before or as Augur 25.3.0—the first
version to include `augur merge`—was packaged into this runtime, but I
plain forgot.
@tsibley tsibley force-pushed the trs/debian-bookworm branch from 97d6efc to 82c12ba Compare September 5, 2024 18:54
Base automatically changed from trs/debian-bookworm to master September 5, 2024 22:22
@tsibley tsibley merged commit 0acdc79 into master Sep 5, 2024
48 checks passed
@tsibley tsibley deleted the trs/sqlite-cli branch September 5, 2024 22:22
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

1 participant