Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
new channel: nixos-19.03 (#1)
  • Loading branch information
zimbatm committed Mar 15, 2019
1 parent e62437e commit f31c910
Show file tree
Hide file tree
Showing 6 changed files with 26 additions and 6 deletions.
7 changes: 7 additions & 0 deletions .gitlab-ci.yml
Expand Up @@ -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
2 changes: 2 additions & 0 deletions .travis.yml
Expand Up @@ -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
13 changes: 12 additions & 1 deletion README.md
Expand Up @@ -65,7 +65,18 @@ All images are automatically built and pushed to Docker Hub.
### Image matrix

`> ./dockerhub-image-matrix`

<!-- BEGIN mdsh -->
| 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) |
<!-- END mdsh -->
| 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) |
Expand Down
6 changes: 3 additions & 3 deletions dockerhub-image-matrix
Expand Up @@ -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
2 changes: 1 addition & 1 deletion overlay.nix
Expand Up @@ -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 {};
Expand Down
2 changes: 1 addition & 1 deletion shell.nix
Expand Up @@ -4,7 +4,7 @@ mkShell {
buildInputs = [
jq
skopeo
];
] ++ lib.optional (pkgs ? mdsh) pkgs.mdsh;

shellHook = ''
# try to work aroud build issues
Expand Down

0 comments on commit f31c910

Please sign in to comment.