From f31c910416956c0a1ab8d7f872a042bdd61d957a Mon Sep 17 00:00:00 2001 From: zimbatm Date: Fri, 15 Mar 2019 13:49:46 +0000 Subject: [PATCH] new channel: nixos-19.03 (#1) --- .gitlab-ci.yml | 7 +++++++ .travis.yml | 2 ++ README.md | 13 ++++++++++++- dockerhub-image-matrix | 6 +++--- overlay.nix | 2 +- shell.nix | 2 +- 6 files changed, 26 insertions(+), 6 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index f112da4..fe55527 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -16,3 +16,10 @@ nixos-18.09: 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 diff --git a/.travis.yml b/.travis.yml index 264e2f0..6f31723 100644 --- a/.travis.yml +++ b/.travis.yml @@ -8,6 +8,8 @@ matrix: env: NIX_PATH=nixpkgs=channel:nixos-unstable IMAGE_TAG=latest - name: nixos-18.09 env: NIX_PATH=nixpkgs=channel:nixos-18.09 IMAGE_TAG=nixos-18.09 + - name: nixos-19.03 + env: NIX_PATH=nixpkgs=channel:nixos-19.03 IMAGE_TAG=nixos-19.03 script: - nix-shell --run ./.travis.sh diff --git a/README.md b/README.md index 0908de1..b496330 100644 --- a/README.md +++ b/README.md @@ -65,7 +65,18 @@ All images are automatically built and pushed to Docker Hub. ### Image matrix `> ./dockerhub-image-matrix` - + +| Image / Tag | latest | nixos-18.09 | nixos-19.03 | +| --- | --- | --- | --- | +| [nixpkgs/bash](https://hub.docker.com/r/nixpkgs/bash) | ![](https://images.microbadger.com/badges/image/nixpkgs/bash.svg) | ![](https://images.microbadger.com/badges/image/nixpkgs/bash:nixos-18.09.svg) | ![](https://images.microbadger.com/badges/image/nixpkgs/bash:nixos-19.03.svg) | +| [nixpkgs/busybox](https://hub.docker.com/r/nixpkgs/busybox) | ![](https://images.microbadger.com/badges/image/nixpkgs/busybox.svg) | ![](https://images.microbadger.com/badges/image/nixpkgs/busybox:nixos-18.09.svg) | ![](https://images.microbadger.com/badges/image/nixpkgs/busybox:nixos-19.03.svg) | +| [nixpkgs/curl](https://hub.docker.com/r/nixpkgs/curl) | ![](https://images.microbadger.com/badges/image/nixpkgs/curl.svg) | ![](https://images.microbadger.com/badges/image/nixpkgs/curl:nixos-18.09.svg) | ![](https://images.microbadger.com/badges/image/nixpkgs/curl:nixos-19.03.svg) | +| [nixpkgs/docker-compose](https://hub.docker.com/r/nixpkgs/docker-compose) | ![](https://images.microbadger.com/badges/image/nixpkgs/docker-compose.svg) | ![](https://images.microbadger.com/badges/image/nixpkgs/docker-compose:nixos-18.09.svg) | ![](https://images.microbadger.com/badges/image/nixpkgs/docker-compose:nixos-19.03.svg) | +| [nixpkgs/kubectl](https://hub.docker.com/r/nixpkgs/kubectl) | ![](https://images.microbadger.com/badges/image/nixpkgs/kubectl.svg) | ![](https://images.microbadger.com/badges/image/nixpkgs/kubectl:nixos-18.09.svg) | ![](https://images.microbadger.com/badges/image/nixpkgs/kubectl:nixos-19.03.svg) | +| [nixpkgs/kubernetes-helm](https://hub.docker.com/r/nixpkgs/kubernetes-helm) | ![](https://images.microbadger.com/badges/image/nixpkgs/kubernetes-helm.svg) | ![](https://images.microbadger.com/badges/image/nixpkgs/kubernetes-helm:nixos-18.09.svg) | ![](https://images.microbadger.com/badges/image/nixpkgs/kubernetes-helm:nixos-19.03.svg) | +| [nixpkgs/nix](https://hub.docker.com/r/nixpkgs/nix) | ![](https://images.microbadger.com/badges/image/nixpkgs/nix.svg) | ![](https://images.microbadger.com/badges/image/nixpkgs/nix:nixos-18.09.svg) | ![](https://images.microbadger.com/badges/image/nixpkgs/nix:nixos-19.03.svg) | +| [nixpkgs/nix-unstable](https://hub.docker.com/r/nixpkgs/nix-unstable) | ![](https://images.microbadger.com/badges/image/nixpkgs/nix-unstable.svg) | ![](https://images.microbadger.com/badges/image/nixpkgs/nix-unstable:nixos-18.09.svg) | ![](https://images.microbadger.com/badges/image/nixpkgs/nix-unstable:nixos-19.03.svg) | + | Image / Tag | latest | nixos-18.09 | | --- | --- | --- | | [nixpkgs/bash](https://hub.docker.com/r/nixpkgs/bash) | ![](https://images.microbadger.com/badges/image/nixpkgs/bash.svg) | ![](https://images.microbadger.com/badges/image/nixpkgs/bash:nixos-18.09.svg) | diff --git a/dockerhub-image-matrix b/dockerhub-image-matrix index 9357e70..f0bdb71 100755 --- a/dockerhub-image-matrix +++ b/dockerhub-image-matrix @@ -21,10 +21,10 @@ microbadge() { releases_json=$(nix-instantiate ./release.nix --strict --eval --json) -echo "| Image / Tag | latest | nixos-18.09 |" -echo "| --- | --- | --- |" +echo "| Image / Tag | latest | nixos-18.09 | nixos-19.03 |" +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") |" + echo "| [$name](https://hub.docker.com/r/$name) | $(microbadge "$name") | $(microbadge "$name" "nixos-18.09") | $(microbadge "$name" "nixos-19.03") |" done diff --git a/overlay.nix b/overlay.nix index f11cb9a..49ad27d 100644 --- a/overlay.nix +++ b/overlay.nix @@ -12,7 +12,7 @@ _: pkgs: { docker-compose = # master pkgs.docker-compose or - # 18.09 + # 18.09 or later pkgs.python3Packages.docker_compose; }; kubectl = pkgs.callPackage ./kubectl {}; diff --git a/shell.nix b/shell.nix index 802184a..73b2e2c 100644 --- a/shell.nix +++ b/shell.nix @@ -4,7 +4,7 @@ mkShell { buildInputs = [ jq skopeo - ]; + ] ++ lib.optional (pkgs ? mdsh) pkgs.mdsh; shellHook = '' # try to work aroud build issues