From cbe20aad650167450eaa2ff9f41e036f7d121f7a Mon Sep 17 00:00:00 2001 From: Anton Novojilov Date: Thu, 16 Mar 2023 15:15:11 +0300 Subject: [PATCH] Use images from GHCR where possible --- README.md | 6 ++---- scripts/bibop-docker | 10 +++++----- 2 files changed, 7 insertions(+), 9 deletions(-) diff --git a/README.md b/README.md index 4e468b70..10a73eab 100644 --- 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 index 102c7a0b..50c9701d 100755 --- 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 "" }