Use images from GHCR where possible

essentialkaos · Mar 16, 2023 · cbe20aa · cbe20aa
1 parent 9165b85
commit cbe20aa
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 9 deletions.
diff --git a/README.md b/README.md
@@ -25,7 +25,7 @@ Information about bibop recipe syntax you can find in our [cookbook](COOKBOOK.md
 
 #### From source
 
-To build the `bibop` from scratch, make sure you have a working Go 1.17+ workspace ([instructions](https://golang.org/doc/install)), then:
+To build the `bibop` from scratch, make sure you have a working Go 1.18+ workspace ([instructions](https://golang.org/doc/install)), then:
 
 ```
 go install github.com/essentialkaos/bibop@latest
@@ -43,7 +43,7 @@ bash <(curl -fsSL https://apps.kaos.st/get) bibop
 
 ### Docker support
 
-Official webkaos images available on [Docker Hub](http://kaos.sh/d/bibop) and [GitHub Container Registry](https://kaos.sh/p/bibop). Install the latest version of Docker, then:
+Official webkaos images available on [GitHub Container Registry](https://kaos.sh/p/bibop) and [Docker Hub](http://kaos.sh/d/bibop). Install the latest version of Docker, then:
 
 ```bash
 curl -fL# -o bibop-docker https://kaos.sh/bibop/bibop-docker
@@ -52,8 +52,6 @@ sudo mv bibop-docker /usr/bin/
 
 bibop-docker your.recipe your-package.rpm
 # or
-bibop-docker --image essentialkaos/bibop:centos7 your.recipe your-package.rpm
-# or
 bibop-docker --image ghcr.io/essentialkaos/bibop:centos7 your.recipe your-package.rpm
 ```
 

diff --git a/scripts/bibop-docker b/scripts/bibop-docker
@@ -58,7 +58,7 @@ SHORT_OPTS="nc:!no_color i:image r:repo"
 
 ################################################################################
 
-image="ghcr.io/essentialkaos/bibop:centos7"
+image="ghcr.io/essentialkaos/bibop:ol8"
 
 ################################################################################
 
@@ -165,11 +165,11 @@ usage() {
   show ""
   show "Examples" $BOLD
   show ""
-  show "  bibop-docker --image essentialkaos/bibop:centos6 webkaos.recipe webkaos webkaos-nginx"
-  show "  Test webkaos and webkaos-nginx packages from kaos-repo on CentOS 6" $DARK
+  show "  bibop-docker --image ghcr.io/essentialkaos/bibop:centos7 webkaos.recipe webkaos webkaos-nginx"
+  show "  Test webkaos and webkaos-nginx packages from kaos-repo on CentOS 7" $DARK
   show ""
-  show "  bibop-docker mkcryptpasswd.recipe mkcryptpasswd-1.7.1-0.el7.noarch.rpm"
-  show "  Test mkcryptpasswd package in CentOS 7" $DARK
+  show "  bibop-docker mkcryptpasswd.recipe mkcryptpasswd-1.7.1-0.el8.noarch.rpm"
+  show "  Test mkcryptpasswd package on Oracle Linux 8" $DARK
   show ""
 }