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

shuttle.dev cleanup #1920

Open
wants to merge 2 commits 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
19 changes: 8 additions & 11 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@
<a href="https://github.com/shuttle-hq/shuttle/search?l=rust">
<img alt="language" src="https://img.shields.io/badge/language-Rust-orange.svg">
</a>
<a href="https://docs.shuttle.rs/">
<img alt="docs" src="https://img.shields.io/badge/docs-shuttle.rs-orange">
<a href="https://docs.shuttle.dev/">
<img alt="docs" src="https://img.shields.io/badge/docs-shuttle.dev-orange">
</a>
<a href="https://docs.rs/shuttle-runtime">
<img alt="crate-docs" src="https://img.shields.io/badge/docs-docs.rs-orange">
Expand Down Expand Up @@ -69,7 +69,7 @@ Get resources and deploy your apps with a few lines of code.

* __One-line Resource Provisioning:__ Get a database, or any other AWS resource by adding a line of code to your main file. To delete one, just remove that line of code. No config/yaml files required.
* __Rapid Development:__ It takes 2 minutes from project initialization to a deployed project. It takes another 2 minutes to provision a resource, and get it deployed to production.
* __First-class support for popular Rust frameworks:__ [Axum](https://docs.shuttle.rs/examples/axum), [Actix Web](https://docs.shuttle.rs/examples/actix), [Rocket](https://docs.shuttle.rs/examples/rocket), and [more](https://docs.shuttle.rs/examples/other)
* __First-class support for popular Rust frameworks:__ [Axum](https://docs.shuttle.dev/examples/axum), [Actix Web](https://docs.shuttle.dev/examples/actix), [Rocket](https://docs.shuttle.dev/examples/rocket), and [more](https://docs.shuttle.dev/examples/other)
* __Security:__ Let us worry about the security & permissions while you focus on writing good code.
<br>
<br>
Expand All @@ -79,13 +79,13 @@ Get resources and deploy your apps with a few lines of code.
On Linux and macOS, you can use this install script, which will automatically install the correct target for your OS and distro:

```sh
curl -sSfL https://www.shuttle.rs/install | bash
curl -sSfL https://www.shuttle.dev/install | bash
```

On Windows, you can use this install script to do the same:

```powershell
iwr "https://www.shuttle.rs/install-win" | iex
iwr "https://www.shuttle.dev/install-win" | iex
```

After installing, log in with:
Expand Down Expand Up @@ -119,7 +119,7 @@ URI: https://hello-world.shuttleapp.rs

Feel free to build on top of the generated `hello-world` boilerplate or take a stab at one of our [examples](https://github.com/shuttle-hq/shuttle-examples).

For the full documentation, visit [our docs](https://docs.shuttle.rs).
For the full documentation, visit [our docs](https://docs.shuttle.dev).
<br>
<br>

Expand Down Expand Up @@ -196,8 +196,8 @@ Now, if we run `shuttle deploy`, we'll have an up and running project with a dat
|-|-|
| [shuttle](https://github.com/shuttle-hq/shuttle) 🚀 (This repo) | The core Shuttle product. Contains all crates that users interact with. |
| [shuttle-examples](https://github.com/shuttle-hq/shuttle-examples) 👨‍🏫 | Officially maintained examples of projects that can be deployed on Shuttle. Also has a list of [community examples](https://github.com/shuttle-hq/shuttle-examples#community-examples). |
| [shuttle-docs](https://github.com/shuttle-hq/shuttle-docs) 📃 | Documentation hosted on [docs.shuttle.rs](https://docs.shuttle.rs/). |
| [www](https://github.com/shuttle-hq/www) 🌍 | Our website [shuttle.rs](https://www.shuttle.rs/), including the [blog](https://www.shuttle.rs/blog/tags/all) and [Launchpad newsletter](https://www.shuttle.rs/launchpad). |
| [shuttle-docs](https://github.com/shuttle-hq/shuttle-docs) 📃 | Documentation hosted on [docs.shuttle.dev](https://docs.shuttle.dev/). |
| [www](https://github.com/shuttle-hq/www) 🌍 | Our website [shuttle.dev](https://www.shuttle.dev/), including the [blog](https://www.shuttle.dev/blog/tags/all) and [Launchpad newsletter](https://www.shuttle.dev/launchpad). |
| [deploy-action](https://github.com/shuttle-hq/deploy-action) ⚙ | GitHub Action for continuous deployments. |
| [awesome-shuttle](https://github.com/shuttle-hq/awesome-shuttle) 🌟 | An awesome list of Shuttle-hosted projects and resources that users can add to. |
| [shuttlings](https://github.com/shuttle-hq/shuttlings) ⚔️ | A collection of Rust code challenges. A great way to get started with using Rust and Shuttle. |
Expand All @@ -219,11 +219,8 @@ Sign up to the [Algora Console](https://console.algora.io/org/shuttle/bounties?s

# Project Status

Check for any outages and incidents on [Shuttle Status](https://status.shuttle.rs/).

We are currently in Public Beta.
Watch "releases" of this repo to get notified of major updates!
Also, check out the [Beta announcement](https://www.shuttle.rs/beta#06) for features we are looking forward to.

- [x] Alpha: We are testing Shuttle, API and deployments may be unstable
- [x] Public Alpha: Anyone can sign up, but go easy on us,
Expand Down
2 changes: 1 addition & 1 deletion api-client/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ edition.workspace = true
license.workspace = true
repository.workspace = true
description = "A library for interacting with the Shuttle platform API"
homepage = "https://www.shuttle.rs"
homepage = "https://www.shuttle.dev"

[dependencies]
shuttle-common = { workspace = true, features = ["models"] }
Expand Down
4 changes: 2 additions & 2 deletions cargo-shuttle/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@ version = "0.49.0"
edition.workspace = true
license.workspace = true
repository.workspace = true
description = "CLI for the Shuttle platform (https://www.shuttle.rs/)"
homepage = "https://www.shuttle.rs"
description = "CLI for the Shuttle platform (https://www.shuttle.dev/)"
homepage = "https://www.shuttle.dev"
default-run = "cargo-shuttle"

[dependencies]
Expand Down
16 changes: 7 additions & 9 deletions cargo-shuttle/README.md
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
<!-- markdownlint-disable -->
<div align="center">

# cargo-shuttle
# Shuttle CLI
jonaro00 marked this conversation as resolved.
Show resolved Hide resolved

<p align=center>
<a href="https://docs.shuttle.rs/">
<a href="https://docs.shuttle.dev/">
<img alt="docs" src="https://img.shields.io/badge/docs-reference-orange">
</a>
<a href="https://github.com/shuttle-hq/shuttle/search?l=rust">
Expand All @@ -16,24 +16,24 @@
</p>
<!-- markdownlint-restore -->

`cargo-shuttle` is the command line tool for deploying Rust apps on [Shuttle](https://www.shuttle.rs/), the Rust-native cloud deployment platform.
This is the command line tool for deploying Rust apps on [Shuttle](https://www.shuttle.dev/), the Rust-native cloud deployment platform.

</div>

## Installation

For the full list of installation options, refer to the [Installation docs](https://docs.shuttle.rs/getting-started/installation).
For the full list of installation options, refer to the [Installation docs](https://docs.shuttle.dev/getting-started/installation).

Linux and macOS:

```sh
curl -sSfL https://www.shuttle.rs/install | bash
curl -sSfL https://www.shuttle.dev/install | bash
```

Windows (powershell):

```powershell
iwr https://www.shuttle.rs/install-win | iex
iwr https://www.shuttle.dev/install-win | iex
```

Build from source:
Expand All @@ -46,10 +46,8 @@ cargo install cargo-shuttle

Run `shuttle help` to see the basic usage.

Full list of commands and more documentation can be viewed on the [CLI docs](https://docs.shuttle.rs/getting-started/shuttle-commands).
Full list of commands and more documentation can be viewed on the [CLI docs](https://docs.shuttle.dev/guides/cli).

## Development

Thanks for using `cargo-shuttle`! We’re very happy to have you with us!

To contribute to `cargo-shuttle` or stay updated with our development, please [open an issue, discussion or PR on Github](https://github.com/shuttle-hq/shuttle) and [join our Discord](https://discord.gg/shuttle)! 🚀
2 changes: 1 addition & 1 deletion cargo-shuttle/src/provisioner_server.rs
Original file line number Diff line number Diff line change
Expand Up @@ -146,7 +146,7 @@ impl LocalProvisioner {
Err(error) => {
error!("Got unexpected error while inspecting docker container: {error}");
error!(
"Make sure Docker is installed and running. For more help: https://docs.shuttle.rs/getting-started/local-run#docker-engines"
"Make sure Docker is installed and running. For more help: https://docs.shuttle.dev/docs/local-run#docker-engines"
);
Err(Status::internal(error.to_string()))
}
Expand Down
4 changes: 2 additions & 2 deletions cargo-shuttle/src/util.rs
Original file line number Diff line number Diff line change
Expand Up @@ -254,7 +254,7 @@ pub async fn update_cargo_shuttle(preview: bool) -> Result<()> {

#[cfg(target_family = "unix")]
let _ = tokio::process::Command::new("bash")
.args(["-c", "curl -sSfL https://www.shuttle.rs/install | bash"])
.args(["-c", "curl -sSfL https://www.shuttle.dev/install | bash"])
.kill_on_drop(true)
.spawn()
.context("Failed to spawn bash update process")?
Expand All @@ -264,7 +264,7 @@ pub async fn update_cargo_shuttle(preview: bool) -> Result<()> {

#[cfg(target_family = "windows")]
let _ = tokio::process::Command::new("powershell")
.args(["-Command", "iwr https://www.shuttle.rs/install-win | iex"])
.args(["-Command", "iwr https://www.shuttle.dev/install-win | iex"])
.kill_on_drop(true)
.spawn()
.context("Failed to spawn powershell update process")?
Expand Down
2 changes: 1 addition & 1 deletion install.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ function Install-Cargo-Shuttle {
\__ \ | | | |_| | |_| |_| | __/
|___/_| |_|\__,_|\__|\__|_|\___|

https://www.shuttle.rs
https://www.shuttle.dev
https://github.com/shuttle-hq/shuttle

Please file an issue if you encounter any problems!
Expand Down
2 changes: 1 addition & 1 deletion install.sh
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ cat <<EOF
\__ \\ | | | |_| | |_| |_| | __/
|___/_| |_|\\__,_|\\__|\\__|_|\\___|

https://www.shuttle.rs
https://www.shuttle.dev
https://github.com/shuttle-hq/shuttle

Please file an issue if you encounter any problems!
Expand Down
2 changes: 1 addition & 1 deletion resources/aws-rds/README.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# Shuttle AWS RDS

This plugin provisions databases on AWS RDS using [shuttle](https://www.shuttle.rs). The following three engines are supported:
This plugin provisions databases on AWS RDS using [shuttle](https://www.shuttle.dev). The following three engines are supported:

- Postgres
- MySql
Expand Down
4 changes: 2 additions & 2 deletions resources/shared-db/README.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# Shuttle Shared Databases

This plugin manages Postgres and MongoDB databases on [Shuttle](https://www.shuttle.rs).
This plugin manages Postgres and MongoDB databases on [Shuttle](https://www.shuttle.dev).
Your database will be in a cluster shared with other users, but it will not be accessible by other users.

- [Docs](https://docs.shuttle.rs/resources/shuttle-shared-db)
- [Docs](https://docs.shuttle.dev/resources/shuttle-shared-db)
6 changes: 3 additions & 3 deletions runtime/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@
<img src="https://raw.githubusercontent.com/shuttle-hq/shuttle/main/assets/logo-rectangle-transparent.png" width="400px" style="margin-left: auto; margin-right: auto;"/>
</div>

[Shuttle](https://www.shuttle.rs/) is a Rust-native cloud development platform that lets you deploy your Rust apps for free.
[Shuttle](https://www.shuttle.dev/) is a Rust-native cloud development platform that lets you deploy your Rust apps for free.

📖 Check out our documentation to get started quickly: [docs.shuttle.rs](https://docs.shuttle.rs)
📖 Check out our documentation to get started quickly: [docs.shuttle.dev](https://docs.shuttle.dev)

🙋‍♂️ If you have any questions, join our [Discord](https://discord.gg/shuttle) server.

Expand Down Expand Up @@ -51,7 +51,7 @@ async fn main() -> shuttle_axum::ShuttleAxum {
}
```

Check out [our docs](https://docs.shuttle.rs/introduction/welcome) to see all the frameworks we support, or
Check out [our docs](https://docs.shuttle.dev) to see all the frameworks we support, or
our [examples](https://github.com/shuttle-hq/shuttle-examples) if you prefer that format.

## Running locally
Expand Down
2 changes: 1 addition & 1 deletion runtime/src/plugins.rs
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ impl ResourceInputBuilder for Metadata {

/// ## Shuttle Secrets
///
/// Plugin for getting secrets in your [Shuttle](https://www.shuttle.rs) service.
/// Plugin for getting secrets in your [Shuttle](https://www.shuttle.dev) service.
///
/// ### Usage
///
Expand Down
4 changes: 2 additions & 2 deletions service/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@ version = "0.49.0"
edition.workspace = true
license.workspace = true
repository.workspace = true
description = "The core traits for running services on Shuttle (https://www.shuttle.rs/)"
homepage = "https://www.shuttle.rs"
description = "The core traits for running services on Shuttle (https://www.shuttle.dev/)"
homepage = "https://www.shuttle.dev"

[lib]
doctest = false
Expand Down