Merge branch 'release/0.17.0'

Author: proofrock

.gitignore

@@ -1,6 +1,7 @@
 # Mine
 
 clippy_results.txt
+bin/
 
 # Generated by Cargo
 # will have compiled files and executables

CHANGES_FROM_WS4SQLITE.md

@@ -1,6 +1,5 @@
 - License change from BSD to Apache 2
 - Removed encryption feature (it was standard-based but very custom)
-- URL to contact for POST is now `http://<host>:<port>/<db_name&gt/exec` (note the `/exec/`)
 - Read-only mode is performed via the `query_only` PRAGMA
 - Even if the database is read only, it's possible to perform init macros
 - YAML file, when explicitly given, is separated with a "::" from the db file/name (to solve ambiguities in windows)

Cargo.lock

@@ -2,7 +2,7 @@
 authors = ["Germano Rizzo <oss /AT/ germanorizzo /DOT/ it>"]
 description = "A SQLite remote gateway - query SQLite via HTTP"
 name = "sqliterg"
-version = "0.0.2"
+version = "0.17.0"
 edition = "2021"
 license = "Apache-2.0"
 
@@ -17,8 +17,8 @@ eyre = "~0"
 hex = "~0"
 ring = "~0"
 # rusqlite = { git  = "https://github.com/rusqlite/rusqlite", features = ["serde_json"] }
-# rusqlite = { version = "~0", features = ["bundled", "serde_json"] }
-rusqlite = { version = "~0", features = ["serde_json"] }
+rusqlite = { version = "~0", features = ["bundled", "serde_json"] }
+# rusqlite = { version = "~0", features = ["serde_json"] }
 serde = { version = "~1", features = ["derive"] }
 serde_derive = "~1"
 serde_json = "~1"

Cargo.toml

@@ -1,19 +1,13 @@
-# FROM rust:latest as build
-# 
-# WORKDIR /app
-# COPY . .
-# 
-# RUN cargo build
-# RUN pwd
-# RUN ls -al target/debug
-# --release
-
 FROM alpine:latest as build
 
-RUN apk add --no-cache rust cargo sqlite-libs sqlite-dev
+RUN apk add --no-cache rust cargo sqlite-libs sqlite-dev sed
 
 COPY . /build
 WORKDIR /build
+
+RUN cp Cargo.toml Cargo.toml.orig
+RUN sed 's/^rusqlite.*$/rusqlite = { version = "~0", features = ["serde_json"] }/' Cargo.toml.orig > Cargo.toml
+
 RUN ["cargo", "build", "--release"]
 
 # Now copy it into our base image.
@@ -27,4 +21,4 @@ RUN apk add --no-cache sqlite-libs libgcc
 EXPOSE 12321
 VOLUME /data
 
-CMD ["/sqliterg"]
+CMD ["/sqliterg"]

Dockerfile

@@ -0,0 +1,17 @@
+# Used by make docker-zbuild-linux. See BUILDING.md
+
+FROM rust:latest as build
+
+RUN apt-get update
+RUN apt-get full-upgrade -y
+RUN apt-get install -y zip
+# RUN cargo install -f cross
+
+WORKDIR /abc
+COPY . .
+
+RUN make build-static-nostatic
+
+# Now copy it into our base image.
+FROM scratch AS export
+COPY --from=build /abc/bin/* .

Dockerfile.binaries

@@ -1,5 +1,19 @@
 .PHONY: test
 
+clean:
+	cargo clean
+	rm -rf bin
+	- docker image prune -af
+	- docker builder prune -af
+
+update:
+	cargo update
+	cd tests && go get -u
+	cd tests && go mod tidy
+
+lint:
+	cargo clippy 2> clippy_results.txt
+
 profile:
 	bash profiler/stress_sqliterg.sh
 	bash profiler/stress_ws4sqlite.sh
@@ -20,14 +34,53 @@ build-debug:
 build:
 	cargo build --release
 
-update:
-	cargo update
-	cd tests && go get -u
-	cd tests && go mod tidy
+build-static-nostatic:
+	rm -rf bin
+	- mkdir bin
+	bash -c "RUSTFLAGS='-C target-feature=+crt-static' cargo build --release --target `uname -m`-unknown-linux-gnu"
+	bash -c "tar czf bin/sqliterg-v0.17.0-linux-`uname -m`-static-bundled.tar.gz -C target/`uname -m`-unknown-linux-gnu/release/ sqliterg"
+	cp Cargo.toml Cargo.toml.orig
+	sed 's/^rusqlite.*$$/rusqlite = { version = "~0", features = [\"serde_json\"] }/' Cargo.toml.orig > Cargo.toml
+	bash -c "cargo build --release --target `uname -m`-unknown-linux-gnu"
+	bash -c "tar czf bin/sqliterg-v0.17.0-linux-`uname -m`-dynamic.tar.gz -C target/`uname -m`-unknown-linux-gnu/release/ sqliterg"
+	mv Cargo.toml.orig Cargo.toml
 
-lint:
-	cargo clippy 2> clippy_results.txt
+build-macos:
+	rm -rf bin
+	- mkdir bin
+	cargo build --release
+	tar czf bin/sqliterg-v0.17.0-macos-x86_64-bundled.tar.gz -C target/release/ sqliterg
+	cargo build --release --target aarch64-apple-darwin
+	tar czf bin/sqliterg-v0.17.0-macos-aarch64-bundled.tar.gz -C target/aarch64-apple-darwin/release/ sqliterg
+	cp Cargo.toml Cargo.toml.orig
+	sed 's/^rusqlite.*$$/rusqlite = { version = "~0", features = [\"serde_json\"] }/' Cargo.toml.orig > Cargo.toml
+	cargo build --release
+	tar czf bin/sqliterg-v0.17.0-macos-x86_64-dynamic.tar.gz -C target/release/ sqliterg
+	cargo build --release --target aarch64-apple-darwin
+	tar czf bin/sqliterg-v0.17.0-macos-aarch64-dynamic.tar.gz -C target/aarch64-apple-darwin/release/ sqliterg	
+	mv Cargo.toml.orig Cargo.toml
 
 docker:
-	docker buildx build . --no-cache -t germanorizzo/sqliterg:latest --push
-	
+	docker run --privileged --rm tonistiigi/binfmt --install arm64
+	docker buildx build --no-cache --platform linux/amd64 -t germanorizzo/sqliterg:v0.17.0-x86_64 --push .
+	docker buildx build --no-cache --platform linux/arm64 -t germanorizzo/sqliterg:v0.17.0-aarch64 --push .
+	- docker manifest rm germanorizzo/sqliterg:v0.17.0
+	docker manifest create germanorizzo/sqliterg:v0.17.0 germanorizzo/sqliterg:v0.17.0-x86_64 germanorizzo/sqliterg:v0.17.0-aarch64
+	docker manifest push germanorizzo/sqliterg:v0.17.0
+	- docker manifest rm germanorizzo/sqliterg:latest
+	docker manifest create germanorizzo/sqliterg:latest germanorizzo/sqliterg:v0.17.0-x86_64 germanorizzo/sqliterg:v0.17.0-aarch64
+	docker manifest push germanorizzo/sqliterg:latest
+
+docker-edge:
+	# in Cargo.toml, set 'version = "0.x.999"' where x is the current minor
+	docker run --privileged --rm tonistiigi/binfmt --install arm64,arm
+	docker buildx build --no-cache --platform linux/amd64 -t germanorizzo/sqliterg:edge --push .
+
+docker-zbuild-linux:
+	- mkdir bin
+	docker run --privileged --rm tonistiigi/binfmt --install arm64,arm
+	docker buildx build --no-cache --platform linux/amd64 -f Dockerfile.binaries --target export -t tmp_binaries_build . --output bin
+	docker buildx build --no-cache --platform linux/arm64 -f Dockerfile.binaries --target export -t tmp_binaries_build . --output bin
+	# Doesn't work. armv7-unknown-linux-gnueabihf must be used. Anyway, for now ARMv7 is out of scope.
+	# docker buildx build --no-cache --platform linux/arm/v7 -f Dockerfile.binaries --target export -t tmp_binaries_build . --output bin
+

Makefile

@@ -12,7 +12,7 @@ As a quick example, after launching
 sqliterg --db mydatabase.db
 ```
 
-It's possible to make a POST call to `http://localhost:12321/mydatabase/exec`, e.g. with the following body:
+It's possible to make a POST call to `http://localhost:12321/mydatabase`, e.g. with the following body:
 
 ```json
 {

README.md

@@ -0,0 +1,18 @@
+- `make update`
+- `make clean`
+- `make test` [~5min]
+- Git: commit & push
+- Git(flow): Release start & push the branch
+- Update the version number
+- Git: commit ("Version labeling") & push
+- `make docker` [33min]
+- `make docker-zbuild-linux` [1h]
+- Compile on macos
+  - checkout the release branch
+  - `make build-macos` [17min]
+- Compile on windows
+  - checkout the release branch
+  - `cargo build --release` [7min]
+  - Zip to a filename like `sqliterg-v0.x.y-win-x86_64-bundled.zip `
+- Git(flow): Release finish
+- Assemble the release on Github