mirror of
				https://gitea.invidious.io/iv-org/invidious
				synced 2025-06-05 23:29:12 +02:00 
			
		
		
		
	Untrack config.yml (#1557)
* Untrack config.yml `config/config.yml` has been untracked and moved to `config/config.example.yml`. The Dockerfile has been updated to copy all `config/config.*` files and to try to move `config/config.example.yml` to `config/config.yml`. If a user supplied `config/config.yml` exists it is not overwritten. * Update Dockerfile to use `shard.lock` * Fix tests
This commit is contained in:
		
							
								
								
									
										1
									
								
								.gitignore
									
									
									
									
										vendored
									
									
								
							
							
						
						
									
										1
									
								
								.gitignore
									
									
									
									
										vendored
									
									
								
							| @@ -6,3 +6,4 @@ | ||||
| /.vscode/ | ||||
| /invidious | ||||
| /sentry | ||||
| /config/config.yml | ||||
|   | ||||
| @@ -2,7 +2,8 @@ FROM crystallang/crystal:0.35.1-alpine AS builder | ||||
| RUN apk add --no-cache curl sqlite-static | ||||
| WORKDIR /invidious | ||||
| COPY ./shard.yml ./shard.yml | ||||
| RUN shards update && shards install && \ | ||||
| COPY ./shard.lock ./shard.lock | ||||
| RUN shards install && \ | ||||
|     # TODO: Document build instructions | ||||
|     # See https://github.com/omarroth/boringssl-alpine/blob/master/APKBUILD, | ||||
|     # https://github.com/omarroth/lsquic-alpine/blob/master/APKBUILD, | ||||
| @@ -23,7 +24,8 @@ WORKDIR /invidious | ||||
| RUN addgroup -g 1000 -S invidious && \ | ||||
|     adduser -u 1000 -S invidious -G invidious | ||||
| COPY ./assets/ ./assets/ | ||||
| COPY --chown=invidious ./config/config.yml ./config/config.yml | ||||
| COPY --chown=invidious ./config/config.* ./config/ | ||||
| RUN mv -n config/config.example.yml config/config.yml | ||||
| RUN sed -i 's/host: \(127.0.0.1\|localhost\)/host: postgres/' config/config.yml | ||||
| COPY ./config/sql/ ./config/sql/ | ||||
| COPY ./locales/ ./locales/ | ||||
|   | ||||
| @@ -12,7 +12,7 @@ require "../src/invidious/search" | ||||
| require "../src/invidious/trending" | ||||
| require "../src/invidious/users" | ||||
|  | ||||
| CONFIG = Config.from_yaml(File.open("config/config.yml")) | ||||
| CONFIG = Config.from_yaml(File.open("config/config.example.yml")) | ||||
|  | ||||
| describe "Helper" do | ||||
|   describe "#produce_channel_videos_url" do | ||||
|   | ||||
		Reference in New Issue
	
	Block a user