From 1fa23404ff3f8aa9d73457a0b774ec4d66f2496a Mon Sep 17 00:00:00 2001 From: zimbatm Date: Thu, 21 Nov 2019 13:14:01 +0000 Subject: [PATCH] update to nixos-19.09 --- .gitlab-ci.yml | 14 +++++++------- README.md | 23 ++++++++++++----------- dockerhub-image-matrix | 4 ++-- 3 files changed, 21 insertions(+), 20 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index fe55527..3699b77 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -10,16 +10,16 @@ nixos-unstable: NIX_PATH: nixpkgs=channel:nixos-unstable IMAGE_TAG: latest -nixos-18.09: - stage: build - script: nix-shell --run ./.gitlab-ci.sh - variables: - NIX_PATH: nixpkgs=channel:nixos-18.09 - IMAGE_TAG: nixos-18.09 - nixos-19.03: stage: build script: nix-shell --run ./.gitlab-ci.sh variables: NIX_PATH: nixpkgs=channel:nixos-19.03 IMAGE_TAG: nixos-19.03 + +nixos-19.09: + stage: build + script: nix-shell --run ./.gitlab-ci.sh + variables: + NIX_PATH: nixpkgs=channel:nixos-19.09 + IMAGE_TAG: nixos-19.09 diff --git a/README.md b/README.md index a3428e5..e228595 100644 --- a/README.md +++ b/README.md @@ -58,8 +58,8 @@ nixpkgs channel describes. | Channel | Image Tag | Description | | --- | --- | --- | | nixos-unstable | latest | latest and greated, major versions might change | -| nixos-18.09 | nixos-18.09 | only minor versions that include security updates | | nixos-19.03 | nixos-19.03 | only minor versions that include security updates | +| nixos-19.09 | nixos-19.09 | only minor versions that include security updates | ## Docker Hub @@ -69,17 +69,18 @@ All images are automatically built and pushed to Docker Hub. `> ./dockerhub-image-matrix` -| Image / Tag | latest | nixos-18.09 | nixos-19.03 | +| Image / Tag | latest | nixos-19.03 | nixos-19.09 | | --- | --- | --- | --- | -| [nixpkgs/bash](https://hub.docker.com/r/nixpkgs/bash) | [![](https://images.microbadger.com/badges/image/nixpkgs/bash.svg)](https://microbadger.com/images/nixpkgs/bash) | [![](https://images.microbadger.com/badges/image/nixpkgs/bash:nixos-18.09.svg)](https://microbadger.com/images/nixpkgs/bash:nixos-18.09) | [![](https://images.microbadger.com/badges/image/nixpkgs/bash:nixos-19.03.svg)](https://microbadger.com/images/nixpkgs/bash:nixos-19.03) | -| [nixpkgs/busybox](https://hub.docker.com/r/nixpkgs/busybox) | [![](https://images.microbadger.com/badges/image/nixpkgs/busybox.svg)](https://microbadger.com/images/nixpkgs/busybox) | [![](https://images.microbadger.com/badges/image/nixpkgs/busybox:nixos-18.09.svg)](https://microbadger.com/images/nixpkgs/busybox:nixos-18.09) | [![](https://images.microbadger.com/badges/image/nixpkgs/busybox:nixos-19.03.svg)](https://microbadger.com/images/nixpkgs/busybox:nixos-19.03) | -| [nixpkgs/curl](https://hub.docker.com/r/nixpkgs/curl) | [![](https://images.microbadger.com/badges/image/nixpkgs/curl.svg)](https://microbadger.com/images/nixpkgs/curl) | [![](https://images.microbadger.com/badges/image/nixpkgs/curl:nixos-18.09.svg)](https://microbadger.com/images/nixpkgs/curl:nixos-18.09) | [![](https://images.microbadger.com/badges/image/nixpkgs/curl:nixos-19.03.svg)](https://microbadger.com/images/nixpkgs/curl:nixos-19.03) | -| [nixpkgs/docker-compose](https://hub.docker.com/r/nixpkgs/docker-compose) | [![](https://images.microbadger.com/badges/image/nixpkgs/docker-compose.svg)](https://microbadger.com/images/nixpkgs/docker-compose) | [![](https://images.microbadger.com/badges/image/nixpkgs/docker-compose:nixos-18.09.svg)](https://microbadger.com/images/nixpkgs/docker-compose:nixos-18.09) | [![](https://images.microbadger.com/badges/image/nixpkgs/docker-compose:nixos-19.03.svg)](https://microbadger.com/images/nixpkgs/docker-compose:nixos-19.03) | -| [nixpkgs/kubectl](https://hub.docker.com/r/nixpkgs/kubectl) | [![](https://images.microbadger.com/badges/image/nixpkgs/kubectl.svg)](https://microbadger.com/images/nixpkgs/kubectl) | [![](https://images.microbadger.com/badges/image/nixpkgs/kubectl:nixos-18.09.svg)](https://microbadger.com/images/nixpkgs/kubectl:nixos-18.09) | [![](https://images.microbadger.com/badges/image/nixpkgs/kubectl:nixos-19.03.svg)](https://microbadger.com/images/nixpkgs/kubectl:nixos-19.03) | -| [nixpkgs/kubernetes-helm](https://hub.docker.com/r/nixpkgs/kubernetes-helm) | [![](https://images.microbadger.com/badges/image/nixpkgs/kubernetes-helm.svg)](https://microbadger.com/images/nixpkgs/kubernetes-helm) | [![](https://images.microbadger.com/badges/image/nixpkgs/kubernetes-helm:nixos-18.09.svg)](https://microbadger.com/images/nixpkgs/kubernetes-helm:nixos-18.09) | [![](https://images.microbadger.com/badges/image/nixpkgs/kubernetes-helm:nixos-19.03.svg)](https://microbadger.com/images/nixpkgs/kubernetes-helm:nixos-19.03) | -| [nixpkgs/nginx](https://hub.docker.com/r/nixpkgs/nginx) | [![](https://images.microbadger.com/badges/image/nixpkgs/nginx.svg)](https://microbadger.com/images/nixpkgs/nginx) | [![](https://images.microbadger.com/badges/image/nixpkgs/nginx:nixos-18.09.svg)](https://microbadger.com/images/nixpkgs/nginx:nixos-18.09) | [![](https://images.microbadger.com/badges/image/nixpkgs/nginx:nixos-19.03.svg)](https://microbadger.com/images/nixpkgs/nginx:nixos-19.03) | -| [nixpkgs/nix](https://hub.docker.com/r/nixpkgs/nix) | [![](https://images.microbadger.com/badges/image/nixpkgs/nix.svg)](https://microbadger.com/images/nixpkgs/nix) | [![](https://images.microbadger.com/badges/image/nixpkgs/nix:nixos-18.09.svg)](https://microbadger.com/images/nixpkgs/nix:nixos-18.09) | [![](https://images.microbadger.com/badges/image/nixpkgs/nix:nixos-19.03.svg)](https://microbadger.com/images/nixpkgs/nix:nixos-19.03) | -| [nixpkgs/nix-unstable](https://hub.docker.com/r/nixpkgs/nix-unstable) | [![](https://images.microbadger.com/badges/image/nixpkgs/nix-unstable.svg)](https://microbadger.com/images/nixpkgs/nix-unstable) | [![](https://images.microbadger.com/badges/image/nixpkgs/nix-unstable:nixos-18.09.svg)](https://microbadger.com/images/nixpkgs/nix-unstable:nixos-18.09) | [![](https://images.microbadger.com/badges/image/nixpkgs/nix-unstable:nixos-19.03.svg)](https://microbadger.com/images/nixpkgs/nix-unstable:nixos-19.03) | +| [nixpkgs/bash](https://hub.docker.com/r/nixpkgs/bash) | [![](https://images.microbadger.com/badges/image/nixpkgs/bash.svg)](https://microbadger.com/images/nixpkgs/bash) | [![](https://images.microbadger.com/badges/image/nixpkgs/bash:nixos-19.03.svg)](https://microbadger.com/images/nixpkgs/bash:nixos-19.03) | [![](https://images.microbadger.com/badges/image/nixpkgs/bash:nixos-19.09.svg)](https://microbadger.com/images/nixpkgs/bash:nixos-19.09) | +| [nixpkgs/busybox](https://hub.docker.com/r/nixpkgs/busybox) | [![](https://images.microbadger.com/badges/image/nixpkgs/busybox.svg)](https://microbadger.com/images/nixpkgs/busybox) | [![](https://images.microbadger.com/badges/image/nixpkgs/busybox:nixos-19.03.svg)](https://microbadger.com/images/nixpkgs/busybox:nixos-19.03) | [![](https://images.microbadger.com/badges/image/nixpkgs/busybox:nixos-19.09.svg)](https://microbadger.com/images/nixpkgs/busybox:nixos-19.09) | +| [nixpkgs/couchpotato](https://hub.docker.com/r/nixpkgs/couchpotato) | [![](https://images.microbadger.com/badges/image/nixpkgs/couchpotato.svg)](https://microbadger.com/images/nixpkgs/couchpotato) | [![](https://images.microbadger.com/badges/image/nixpkgs/couchpotato:nixos-19.03.svg)](https://microbadger.com/images/nixpkgs/couchpotato:nixos-19.03) | [![](https://images.microbadger.com/badges/image/nixpkgs/couchpotato:nixos-19.09.svg)](https://microbadger.com/images/nixpkgs/couchpotato:nixos-19.09) | +| [nixpkgs/curl](https://hub.docker.com/r/nixpkgs/curl) | [![](https://images.microbadger.com/badges/image/nixpkgs/curl.svg)](https://microbadger.com/images/nixpkgs/curl) | [![](https://images.microbadger.com/badges/image/nixpkgs/curl:nixos-19.03.svg)](https://microbadger.com/images/nixpkgs/curl:nixos-19.03) | [![](https://images.microbadger.com/badges/image/nixpkgs/curl:nixos-19.09.svg)](https://microbadger.com/images/nixpkgs/curl:nixos-19.09) | +| [nixpkgs/docker-compose](https://hub.docker.com/r/nixpkgs/docker-compose) | [![](https://images.microbadger.com/badges/image/nixpkgs/docker-compose.svg)](https://microbadger.com/images/nixpkgs/docker-compose) | [![](https://images.microbadger.com/badges/image/nixpkgs/docker-compose:nixos-19.03.svg)](https://microbadger.com/images/nixpkgs/docker-compose:nixos-19.03) | [![](https://images.microbadger.com/badges/image/nixpkgs/docker-compose:nixos-19.09.svg)](https://microbadger.com/images/nixpkgs/docker-compose:nixos-19.09) | +| [nixpkgs/kubectl](https://hub.docker.com/r/nixpkgs/kubectl) | [![](https://images.microbadger.com/badges/image/nixpkgs/kubectl.svg)](https://microbadger.com/images/nixpkgs/kubectl) | [![](https://images.microbadger.com/badges/image/nixpkgs/kubectl:nixos-19.03.svg)](https://microbadger.com/images/nixpkgs/kubectl:nixos-19.03) | [![](https://images.microbadger.com/badges/image/nixpkgs/kubectl:nixos-19.09.svg)](https://microbadger.com/images/nixpkgs/kubectl:nixos-19.09) | +| [nixpkgs/kubernetes-helm](https://hub.docker.com/r/nixpkgs/kubernetes-helm) | [![](https://images.microbadger.com/badges/image/nixpkgs/kubernetes-helm.svg)](https://microbadger.com/images/nixpkgs/kubernetes-helm) | [![](https://images.microbadger.com/badges/image/nixpkgs/kubernetes-helm:nixos-19.03.svg)](https://microbadger.com/images/nixpkgs/kubernetes-helm:nixos-19.03) | [![](https://images.microbadger.com/badges/image/nixpkgs/kubernetes-helm:nixos-19.09.svg)](https://microbadger.com/images/nixpkgs/kubernetes-helm:nixos-19.09) | +| [nixpkgs/nginx](https://hub.docker.com/r/nixpkgs/nginx) | [![](https://images.microbadger.com/badges/image/nixpkgs/nginx.svg)](https://microbadger.com/images/nixpkgs/nginx) | [![](https://images.microbadger.com/badges/image/nixpkgs/nginx:nixos-19.03.svg)](https://microbadger.com/images/nixpkgs/nginx:nixos-19.03) | [![](https://images.microbadger.com/badges/image/nixpkgs/nginx:nixos-19.09.svg)](https://microbadger.com/images/nixpkgs/nginx:nixos-19.09) | +| [nixpkgs/nix](https://hub.docker.com/r/nixpkgs/nix) | [![](https://images.microbadger.com/badges/image/nixpkgs/nix.svg)](https://microbadger.com/images/nixpkgs/nix) | [![](https://images.microbadger.com/badges/image/nixpkgs/nix:nixos-19.03.svg)](https://microbadger.com/images/nixpkgs/nix:nixos-19.03) | [![](https://images.microbadger.com/badges/image/nixpkgs/nix:nixos-19.09.svg)](https://microbadger.com/images/nixpkgs/nix:nixos-19.09) | +| [nixpkgs/nix-unstable](https://hub.docker.com/r/nixpkgs/nix-unstable) | [![](https://images.microbadger.com/badges/image/nixpkgs/nix-unstable.svg)](https://microbadger.com/images/nixpkgs/nix-unstable) | [![](https://images.microbadger.com/badges/image/nixpkgs/nix-unstable:nixos-19.03.svg)](https://microbadger.com/images/nixpkgs/nix-unstable:nixos-19.03) | [![](https://images.microbadger.com/badges/image/nixpkgs/nix-unstable:nixos-19.09.svg)](https://microbadger.com/images/nixpkgs/nix-unstable:nixos-19.09) | ## Adding new images diff --git a/dockerhub-image-matrix b/dockerhub-image-matrix index c1f1fd5..83055f7 100755 --- a/dockerhub-image-matrix +++ b/dockerhub-image-matrix @@ -23,10 +23,10 @@ microbadge() { releases_json=$(nix-instantiate ./release.nix --strict --eval --json) -echo "| Image / Tag | latest | nixos-18.09 | nixos-19.03 |" +echo "| Image / Tag | latest | nixos-19.03 | nixos-19.09 |" echo "| --- | --- | --- | --- |" for attr in $(echo "$releases_json" | jq -r "keys[]") ; do name=nixpkgs/$attr - echo "| [$name](https://hub.docker.com/r/$name) | $(microbadge "$name") | $(microbadge "$name" "nixos-18.09") | $(microbadge "$name" "nixos-19.03") |" + echo "| [$name](https://hub.docker.com/r/$name) | $(microbadge "$name") | $(microbadge "$name" "nixos-19.03") | $(microbadge "$name" "nixos-19.09") |" done