Skip to content
This repository was archived by the owner on Oct 18, 2023. It is now read-only.

rename sqld to libsql-server #694

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/pr-images.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
name: Create and publish sqld binaried and Docker image
name: Create and publish libsql-server binaried and Docker image

on:
pull_request:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/publish.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
name: Create and publish sqld binaried and Docker image
name: Create and publish libsql-server binaried and Docker image

on:
push:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -159,7 +159,7 @@ jobs:
steps:
- uses: actions/checkout@v3
with:
repository: "libsql/homebrew-sqld"
repository: "libsql/homebrew-libsql"
token: ${{ secrets.HOMEBREW_TAP_TOKEN }}
# So we have access to the formula
- name: Fetch local artifacts
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/rust.yml
Original file line number Diff line number Diff line change
Expand Up @@ -108,7 +108,7 @@ jobs:
submodules: recursive
- name: Test openssl
shell: bash {0}
run: cargo tree -p sqld -i openssl; [ $? = 101 ]
run: cargo tree -p libsql-server -i openssl; [ $? = 101 ]

docker:
runs-on: ubuntu-latest
Expand All @@ -126,4 +126,4 @@ jobs:
uses: docker/build-push-action@v3
with:
context: .
tags: sqld:unstable
tags: libsql-server:unstable
180 changes: 90 additions & 90 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@
members = [
"bottomless",
"bottomless-cli",
"sqld",
"sqld-libsql-bindings",
"libsql-server",
"libsql-bindings",
"testing/end-to-end",
]

Expand Down
18 changes: 9 additions & 9 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# build sqld
# build libsql-server
FROM rust:slim-bullseye AS chef
RUN apt update \
&& apt install -y libclang-dev clang \
Expand All @@ -23,18 +23,18 @@ FROM chef AS builder
COPY --from=planner /recipe.json recipe.json
RUN cargo chef cook --release --recipe-path recipe.json
COPY . .
RUN cargo build -p sqld --release
RUN cargo build -p libsql-server --release

# runtime
FROM debian:bullseye-slim
COPY --from=builder /target/release/sqld /bin/sqld
RUN groupadd --system --gid 666 sqld
RUN adduser --system --home /var/lib/sqld --uid 666 --gid 666 sqld
COPY --from=builder /target/release/libsql-server /bin/libsql-server
RUN groupadd --system --gid 666 libsql-server
RUN adduser --system --home /var/lib/libsql-server --uid 666 --gid 666 libsql-server
RUN apt-get update && apt-get install -y ca-certificates
COPY docker-entrypoint.sh /usr/local/bin
ENTRYPOINT ["/usr/local/bin/docker-entrypoint.sh"]
VOLUME [ "/var/lib/sqld" ]
WORKDIR /var/lib/sqld
USER sqld
VOLUME [ "/var/lib/libsql-server" ]
WORKDIR /var/lib/libsql-server
USER libsql-server
EXPOSE 5001 8080
CMD ["/bin/sqld"]
CMD ["/bin/libsql-server"]
24 changes: 12 additions & 12 deletions Dockerfile.dev
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# build sqld
# build libsql-server
FROM rust:slim-bullseye as builder
RUN apt update

Expand All @@ -9,31 +9,31 @@ RUN apt install -y libclang-dev clang \
RUN apt clean
RUN update-ca-certificates

WORKDIR /sqld
WORKDIR /libsql-server
COPY . .
RUN --mount=type=cache,target=/usr/local/cargo/registry \
--mount=type=cache,target=/usr/local/cargo/git \
--mount=type=cache,target=/sqld/target \
cargo build -p sqld --release && \
cp target/release/sqld /sqld/bin
--mount=type=cache,target=/libsql-server/target \
cargo build -p libsql-server --release && \
cp target/release/libsql-server /libsql-server/bin


# runtime
FROM debian:bullseye-slim
RUN apt update

COPY --from=builder /sqld/bin /bin/sqld
COPY --from=builder /libsql-server/bin /bin/libsql-server
COPY --from=builder /etc/ssl/certs/ca-certificates.crt /etc/ssl/certs/ca-certificates.crt
COPY docker-entrypoint.sh /usr/local/bin

VOLUME [ "/var/lib/sqld" ]
VOLUME [ "/var/lib/libsql-server" ]

RUN groupadd --system --gid 666 sqld
RUN adduser --system --home /var/lib/sqld --uid 666 --gid 666 sqld
USER sqld
WORKDIR /var/lib/sqld
RUN groupadd --system --gid 666 libsql-server
RUN adduser --system --home /var/lib/libsql-server --uid 666 --gid 666 libsql-server
USER libsql-server
WORKDIR /var/lib/libsql-server

EXPOSE 5001 8080

ENTRYPOINT ["/usr/local/bin/docker-entrypoint.sh"]
CMD ["/bin/sqld"]
CMD ["/bin/libsql-server"]
2 changes: 1 addition & 1 deletion LICENSE.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
MIT License

Copyright 2023 the sqld authors
Copyright 2023 the libsql-server authors

Permission is hereby granted, free of charge, to any person obtaining a copy of
this software and associated documentation files (the "Software"), to deal in
Expand Down
Loading