From 2f6804a8a5a3e76d3c556d0dda48da7359a270cd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20=C5=A0ediv=C3=BD?= Date: Thu, 3 Apr 2025 21:16:44 +0200 Subject: [PATCH] change to ghcr. --- OpenApi.yml | 10 +++++----- README.md | 4 ++-- docs/dind/README.md | 2 +- docs/dind/nrooms-start.sh | 4 ++-- internal/config/room.go | 26 ++++++++++++++------------ traefik/install | 2 +- 6 files changed, 25 insertions(+), 23 deletions(-) diff --git a/OpenApi.yml b/OpenApi.yml index 225bd03..9223af5 100644 --- a/OpenApi.yml +++ b/OpenApi.yml @@ -381,7 +381,7 @@ components: type: array items: type: string - example: m1k1o/neko:latest + example: ghcr.io/m1k1o/neko/firefox:latest storage_enabled: type: boolean example: true @@ -403,7 +403,7 @@ components: example: foobar neko_image: type: string - example: m1k1o/neko:latest + example: ghcr.io/m1k1o/neko/firefox:latest is_outdated: type: boolean example: true @@ -481,7 +481,7 @@ components: example: foobar neko_image: type: string - example: m1k1o/neko:latest + example: ghcr.io/m1k1o/neko/firefox:latest max_connections: type: number default: 10 @@ -653,7 +653,7 @@ components: properties: neko_image: type: string - example: m1k1o/neko:latest + example: ghcr.io/m1k1o/neko/firefox:latest registry_user: type: string registry_pass: @@ -664,7 +664,7 @@ components: properties: status: type: string - example: m1k1o/neko:latest + example: ghcr.io/m1k1o/neko/firefox:latest progressDetail: type: object properties: diff --git a/README.md b/README.md index 4e25dba..6b9ede7 100644 --- a/README.md +++ b/README.md @@ -51,8 +51,8 @@ Otherwise modify variables in `docker-compose.yml` and just run `docker-compose You need to pull all your images, that you want to use with neko-room. Otherwise, you might get this error: `Error response from daemon: No such image:` (see issue #1). ```sh -docker pull m1k1o/neko:firefox -docker pull m1k1o/neko:chromium +docker pull ghcr.io/m1k1o/neko/firefox +docker pull ghcr.io/m1k1o/neko/chromium # etc... ``` diff --git a/docs/dind/README.md b/docs/dind/README.md index f27c79c..62a0cde 100644 --- a/docs/dind/README.md +++ b/docs/dind/README.md @@ -14,5 +14,5 @@ However, there are some usecases, when this might come in handy: In order to pull new images run: ```sh -docker-compose exec neko-rooms docker pull m1k1o/neko:chromium +docker-compose exec neko-rooms docker pull ghcr.io/m1k1o/neko/chromium ``` diff --git a/docs/dind/nrooms-start.sh b/docs/dind/nrooms-start.sh index be428ef..3a9be9d 100755 --- a/docs/dind/nrooms-start.sh +++ b/docs/dind/nrooms-start.sh @@ -37,8 +37,8 @@ docker run -d \ --entrypoints.web.address=:80; # pull some neko images... -docker pull m1k1o/neko:firefox -docker pull m1k1o/neko:chromium +docker pull ghcr.io/m1k1o/neko/firefox +docker pull ghcr.io/m1k1o/neko/chromium # # (re)start neko-rooms diff --git a/internal/config/room.go b/internal/config/room.go index 80b674b..be98043 100644 --- a/internal/config/room.go +++ b/internal/config/room.go @@ -64,18 +64,20 @@ func (Room) Init(cmd *cobra.Command) error { } cmd.PersistentFlags().StringSlice("neko_images", []string{ - "m1k1o/neko:firefox", - "m1k1o/neko:chromium", - "m1k1o/neko:google-chrome", - "m1k1o/neko:ungoogled-chromium", - "m1k1o/neko:microsoft-edge", - "m1k1o/neko:brave", - "m1k1o/neko:vivaldi", - "m1k1o/neko:tor-browser", - "m1k1o/neko:vlc", - "m1k1o/neko:remmina", - "m1k1o/neko:xfce", - "m1k1o/neko:kde", + "ghcr.io/m1k1o/neko/firefox", + "ghcr.io/m1k1o/neko/waterfox", + "ghcr.io/m1k1o/neko/tor-browser", + "ghcr.io/m1k1o/neko/chromium", + "ghcr.io/m1k1o/neko/google-chrome", + "ghcr.io/m1k1o/neko/ungoogled-chromium", + "ghcr.io/m1k1o/neko/microsoft-edge", + "ghcr.io/m1k1o/neko/brave", + "ghcr.io/m1k1o/neko/vivaldi", + "ghcr.io/m1k1o/neko/opera", + "ghcr.io/m1k1o/neko/remmina", + "ghcr.io/m1k1o/neko/vlc", + "ghcr.io/m1k1o/neko/xfce", + "ghcr.io/m1k1o/neko/kde", }, "neko images to be used") if err := viper.BindPFlag("neko_images", cmd.PersistentFlags().Lookup("neko_images")); err != nil { return err diff --git a/traefik/install b/traefik/install index 202858b..6d0c597 100755 --- a/traefik/install +++ b/traefik/install @@ -202,7 +202,7 @@ echo "[Y] Got all settings..." # Create env # -NEKO_IMAGES=(m1k1o/neko:firefox m1k1o/neko:chromium m1k1o/neko:google-chrome) +NEKO_IMAGES=(ghcr.io/m1k1o/neko/firefox ghcr.io/m1k1o/neko/chromium ghcr.io/m1k1o/neko/google-chrome) { echo "TZ=${TZ}"