add direnv support, update license to 2024

auguwu · Jan 14, 2024 · e3b9d59 · e3b9d59
1 parent b885d92
commit e3b9d59
Show file tree

Hide file tree

Showing 50 changed files with 102 additions and 121 deletions.
diff --git a/.envrc b/.envrc
@@ -0,0 +1,33 @@
+# 🐻‍❄️💐 ume: Easy, self-hostable, and flexible image host made in Rust
+# Copyright 2021-2024 Noel Towa <[email protected]>
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+if ! has nix_direnv_version || ! nix_direnv_version 2.3.0; then
+  source_url "https://raw.githubusercontent.com/nix-community/nix-direnv/2.3.0/direnvrc" "sha256-Dmd+j63L84wuzgyjITIfSxSD57Tx7v51DMxVZOsiUD8="
+fi
+
+# make .direnv if it doesn't exist
+mkdir -p "$(direnv_layout_dir)"
+
+watch_file shell.nix
+watch_file flake.nix # as outputs can change at anytime
+watch_file flake.lock
+
+# we need to watch the rust-toolchain.toml file so if any edits occur,
+# then direnv can react to it and change the environment.
+watch_file rust-toolchain.toml
+
+# try to use flakes, if it fails use normal nix (ie. shell.nix)
+use flake || use nix
+eval "$shellHook"
diff --git a/.github/workflows/CI.yaml b/.github/workflows/CI.yaml
@@ -1,5 +1,5 @@
 # 🐻‍❄️💐 ume: Easy, self-hostable, and flexible image host made in Rust
-# Copyright 2021-2023 Noel Towa <[email protected]>
+# Copyright 2021-2024 Noel Towa <[email protected]>
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

diff --git a/.github/workflows/Release.yaml b/.github/workflows/Release.yaml
@@ -1,5 +1,5 @@
 # 🐻‍❄️💐 ume: Easy, self-hostable, and flexible image host made in Rust
-# Copyright 2021-2023 Noel Towa <[email protected]>
+# Copyright 2021-2024 Noel Towa <[email protected]>
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

diff --git a/.gitignore b/.gitignore
@@ -1,10 +1,3 @@
-# Created by https://www.toptal.com/developers/gitignore/api/Rust,VisualStudio,VisualStudioCode,JetBrains+All,Terraform
-# Edit at https://www.toptal.com/developers/gitignore?templates=Rust,VisualStudio,VisualStudioCode,JetBrains+All,Terraform
-
-### JetBrains+all ###
-# Covers JetBrains IDEs: IntelliJ, RubyMine, PhpStorm, AppCode, PyCharm, CLion, Android Studio, WebStorm and Rider
-# Reference: https://intellij-support.jetbrains.com/hc/en-us/articles/206544839
-
 # User-specific stuff
 .idea/**/workspace.xml
 .idea/**/tasks.xml
@@ -556,4 +549,5 @@ FodyWeavers.xsd
 
 config.yml
 !src/bin/
+.direnv/
 .env
diff --git a/.noel/deployment/charts/ume.yaml b/.noel/deployment/charts/ume.yaml
@@ -1,5 +1,5 @@
 # 🐻‍❄️💐 ume: Easy, self-hostable, and flexible image host made in Rust
-# Copyright 2021-2023 Noel Towa <[email protected]>
+# Copyright 2021-2024 Noel Towa <[email protected]>
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

diff --git a/.noel/deployment/main.tf b/.noel/deployment/main.tf
@@ -1,5 +1,5 @@
 # 🐻‍❄️💐 ume: Easy, self-hostable, and flexible image host made in Rust
-# Copyright 2021-2023 Noel Towa <[email protected]>
+# Copyright 2021-2024 Noel Towa <[email protected]>
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

diff --git a/.noel/deployment/vars.tf b/.noel/deployment/vars.tf
@@ -1,5 +1,5 @@
 # 🐻‍❄️💐 ume: Easy, self-hostable, and flexible image host made in Rust
-# Copyright 2021-2023 Noel Towa <[email protected]>
+# Copyright 2021-2024 Noel Towa <[email protected]>
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

diff --git a/Cargo.toml b/Cargo.toml
@@ -1,5 +1,5 @@
 # 🐻‍❄️💐 ume: Easy, self-hostable, and flexible image host made in Rust
-# Copyright 2021-2023 Noel Towa <[email protected]>
+# Copyright 2021-2024 Noel Towa <[email protected]>
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -28,7 +28,7 @@ path = "src/bin/main.rs"
 
 [dependencies]
 async-trait = "0.1.73"
-aws-sdk-s3 = "0.28.0" # must be pinned to what `remi-s3` supports
+aws-sdk-s3 = "0.28.0"                                                         # must be pinned to what `remi-s3` supports
 axum = { version = "0.6.20", features = ["headers", "macros", "multipart"] }
 bytes = "1.5.0"
 chrono = { version = "0.4.31", features = ["serde"] }

diff --git a/LICENSE b/LICENSE
@@ -186,7 +186,7 @@
       same "printed page" as the copyright notice for easier
       identification within third-party archives.
 
-   Copyright 2021-2023 Noel Towa <[email protected]>
+   Copyright 2021-2024 Noel Towa <[email protected]>
 
    Licensed under the Apache License, Version 2.0 (the "License");
    you may not use this file except in compliance with the License.

diff --git a/build.rs b/build.rs
@@ -1,5 +1,5 @@
 // 🐻‍❄️💐 ume: Easy, self-hostable, and flexible image host made in Rust
-// Copyright 2021-2023 Noel Towa <[email protected]>
+// Copyright 2021-2024 Noel Towa <[email protected]>
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.

diff --git a/default.nix b/default.nix
@@ -1,5 +1,5 @@
 # 🐻‍❄️💐 ume: Easy, self-hostable, and flexible image host made in Rust
-# Copyright 2021-2023 Noel Towa <[email protected]>
+# Copyright 2021-2024 Noel Towa <[email protected]>
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

diff --git a/distribution/docker/alpine.Dockerfile b/distribution/docker/alpine.Dockerfile
@@ -1,5 +1,5 @@
 # 🐻‍❄️💐 ume: Easy, self-hostable, and flexible image host made in Rust
-# Copyright 2021-2023 Noel Towa <[email protected]>
+# Copyright 2021-2024 Noel Towa <[email protected]>
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -13,6 +13,6 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-FROM rust:1.73-alpine3.18 AS build
+FROM rust:1.75-alpine3.19 AS build
 
-FROM alpine:3.18
+FROM alpine:3.19
diff --git a/distribution/docker/debian.Dockerfile b/distribution/docker/debian.Dockerfile
@@ -1,5 +1,5 @@
 # 🐻‍❄️💐 ume: Easy, self-hostable, and flexible image host made in Rust
-# Copyright 2021-2023 Noel Towa <[email protected]>
+# Copyright 2021-2024 Noel Towa <[email protected]>
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -13,6 +13,6 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-FROM rust:1.73-slim-bullseye AS build
+FROM rust:1.75-slim-bullseye AS build
 
 FROM debian:bullseye-slim
diff --git a/distribution/docker/scripts/docker-entrypoint.sh b/distribution/docker/scripts/docker-entrypoint.sh
@@ -1,7 +1,7 @@
 #!/usr/bin/env bash
 
 # 🐻‍❄️💐 ume: Easy, self-hostable, and flexible image host made in Rust
-# Copyright 2021-2023 Noel Towa <[email protected]>
+# Copyright 2021-2024 Noel Towa <[email protected]>
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

diff --git a/distribution/docker/scripts/liblog.sh b/distribution/docker/scripts/liblog.sh
@@ -1,7 +1,7 @@
 #!/usr/bin/env bash
 
 # 🐻‍❄️💐 ume: Easy, self-hostable, and flexible image host made in Rust
-# Copyright 2021-2023 Noel Towa <[email protected]>
+# Copyright 2021-2024 Noel Towa <[email protected]>
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

diff --git a/distribution/helm/.charted.yaml b/distribution/helm/.charted.yaml
@@ -1,5 +1,5 @@
 # 🐻‍❄️💐 ume: Easy, self-hostable, and flexible image host made in Rust
-# Copyright 2021-2023 Noel Towa <[email protected]>
+# Copyright 2021-2024 Noel Towa <[email protected]>
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

diff --git a/flake.lock b/flake.lock
diff --git a/flake.nix b/flake.nix
@@ -1,5 +1,5 @@
 # 🐻‍❄️💐 ume: Easy, self-hostable, and flexible image host made in Rust
-# Copyright 2021-2023 Noel Towa <[email protected]>
+# Copyright 2021-2024 Noel Towa <[email protected]>
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

diff --git a/rust-toolchain.toml b/rust-toolchain.toml
@@ -1,5 +1,5 @@
 # 🐻‍❄️💐 ume: Easy, self-hostable, and flexible image host made in Rust
-# Copyright 2021-2023 Noel Towa <[email protected]>
+# Copyright 2021-2024 Noel Towa <[email protected]>
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -14,14 +14,14 @@
 # limitations under the License.
 
 [toolchain]
-channel = "stable"
+channel = "1.75"
 profile = "minimal"
 targets = [
     "aarch64-unknown-linux-gnu",
     "x86_64-apple-darwin",
     "x86_64-unknown-linux-gnu",
     "x86_64-unknown-linux-musl",
-    "x86_64-pc-windows-msvc"
+    "x86_64-pc-windows-msvc",
 ]
 components = [
     "rustc",
@@ -30,5 +30,5 @@ components = [
     "rust-src",
     "rust-std",
     "clippy",
-    "rustfmt"
+    "rustfmt",
 ]
diff --git a/shell.nix b/shell.nix
@@ -1,5 +1,5 @@
 # 🐻‍❄️💐 ume: Easy, self-hostable, and flexible image host made in Rust
-# Copyright 2021-2023 Noel Towa <[email protected]>
+# Copyright 2021-2024 Noel Towa <[email protected]>
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

diff --git a/src/bin/main.rs b/src/bin/main.rs
@@ -1,5 +1,5 @@
 // 🐻‍❄️💐 ume: Easy, self-hostable, and flexible image host made in Rust
-// Copyright 2021-2023 Noel Towa <[email protected]>
+// Copyright 2021-2024 Noel Towa <[email protected]>
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.

diff --git a/src/cli/commands/generate/config.rs b/src/cli/commands/generate/config.rs
@@ -1,5 +1,5 @@
 // 🐻‍❄️💐 ume: Easy, self-hostable, and flexible image host made in Rust
-// Copyright 2021-2023 Noel Towa <[email protected]>
+// Copyright 2021-2024 Noel Towa <[email protected]>
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.

diff --git a/src/cli/commands/generate/mod.rs b/src/cli/commands/generate/mod.rs
@@ -1,5 +1,5 @@
 // 🐻‍❄️💐 ume: Easy, self-hostable, and flexible image host made in Rust
-// Copyright 2021-2023 Noel Towa <[email protected]>
+// Copyright 2021-2024 Noel Towa <[email protected]>
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.

diff --git a/src/cli/commands/generate/sharex.rs b/src/cli/commands/generate/sharex.rs
@@ -1,5 +1,5 @@
 // 🐻‍❄️💐 ume: Easy, self-hostable, and flexible image host made in Rust
-// Copyright 2021-2023 Noel Towa <[email protected]>
+// Copyright 2021-2024 Noel Towa <[email protected]>
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.

diff --git a/src/cli/commands/mod.rs b/src/cli/commands/mod.rs
@@ -1,5 +1,5 @@
 // 🐻‍❄️💐 ume: Easy, self-hostable, and flexible image host made in Rust
-// Copyright 2021-2023 Noel Towa <[email protected]>
+// Copyright 2021-2024 Noel Towa <[email protected]>
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.

diff --git a/src/cli/commands/openapi.rs b/src/cli/commands/openapi.rs
@@ -1,5 +1,5 @@
 // 🐻‍❄️💐 ume: Easy, self-hostable, and flexible image host made in Rust
-// Copyright 2021-2023 Noel Towa <[email protected]>
+// Copyright 2021-2024 Noel Towa <[email protected]>
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.