remove 19.03 and 19.09 channels
Those are not receiving any more updates. Fix Nix invocations.
This commit is contained in:
zimbatm
parent
061bb32ed2
commit
a720d8ee4f
6 changed files with 35 additions and 51 deletions
|
|
@ -1,29 +1,17 @@
|
|||
image: nixos/nix:latest
|
||||
image: nixpkgs/nix:nixos-20.03
|
||||
|
||||
stages:
|
||||
- build
|
||||
|
||||
nixos-unstable:
|
||||
stage: build
|
||||
script: nix-shell --run ./.gitlab-ci.sh
|
||||
script: NIX_PATH=channel:$NIXPKGS_CHANNEL nix-shell --run ./.gitlab-ci.sh
|
||||
variables:
|
||||
NIXPKGS_CHANNEL: nixos-unstable
|
||||
IMAGE_TAG: latest
|
||||
|
||||
nixos-20.03:
|
||||
stage: build
|
||||
script: nix-shell --run ./.gitlab-ci.sh
|
||||
script: NIX_PATH=channel:$NIXPKGS_CHANNEL nix-shell --run ./.gitlab-ci.sh
|
||||
variables:
|
||||
NIXPKGS_CHANNEL: nixos-20.03
|
||||
|
||||
nixos-19.09:
|
||||
stage: build
|
||||
script: nix-shell --run ./.gitlab-ci.sh
|
||||
variables:
|
||||
NIXPKGS_CHANNEL: nixos-19.09
|
||||
|
||||
nixos-19.03:
|
||||
stage: build
|
||||
script: nix-shell --run ./.gitlab-ci.sh
|
||||
variables:
|
||||
NIXPKGS_CHANNEL: nixos-19.03
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
language: nix
|
||||
|
||||
nix: 2.2.1
|
||||
nix: 2.3.6
|
||||
|
||||
matrix:
|
||||
include:
|
||||
|
|
@ -8,10 +8,6 @@ matrix:
|
|||
env: NIXPKGS_CHANNEL=nixos-unstable IMAGE_TAG=latest
|
||||
- name: nixos-20.03
|
||||
env: NIXPKGS_CHANNEL=nixos-20.03
|
||||
- name: nixos-19.09
|
||||
env: NIXPKGS_CHANNEL=nixos-19.09
|
||||
- name: nixos-19.03
|
||||
env: NIXPKGS_CHANNEL=nixos-19.03
|
||||
|
||||
script:
|
||||
- nix-shell --run ./.travis.sh
|
||||
- NIX_PATH=channel:$NIXPKGS_CHANNEL nix-shell --run ./.travis.sh
|
||||
|
|
|
|||
40
README.md
40
README.md
|
|
@ -58,9 +58,7 @@ nixpkgs channel describes.
|
|||
| Channel | Image Tag | Description |
|
||||
| --- | --- | --- |
|
||||
| nixos-unstable | latest | latest and greated, major versions might change |
|
||||
| nixos-20.03 | nixos-20.03 | next release, still baking |
|
||||
| nixos-19.09 | nixos-19.09 | only minor versions that include security updates |
|
||||
| nixos-19.03 | nixos-19.03 | only minor versions that include security updates |
|
||||
| nixos-20.03 | nixos-20.03 | only minor versions that include security updates |
|
||||
|
||||
## Docker Hub
|
||||
|
||||
|
|
@ -70,24 +68,24 @@ All images are automatically built and pushed to Docker Hub.
|
|||
|
||||
`> ./dockerhub-image-matrix`
|
||||
<!-- BEGIN mdsh -->
|
||||
| Image / Tag | latest | nixos-20.03 | nixos-19.09 | nixos-19.03 |
|
||||
| --- | --- | --- | --- | --- |
|
||||
| [nixpkgs/bash](https://hub.docker.com/r/nixpkgs/bash) | [](https://microbadger.com/images/nixpkgs/bash) | [](https://microbadger.com/images/nixpkgs/bash:nixos-20.03) | [](https://microbadger.com/images/nixpkgs/bash:nixos-19.09) | [](https://microbadger.com/images/nixpkgs/bash:nixos-19.03) |
|
||||
| [nixpkgs/busybox](https://hub.docker.com/r/nixpkgs/busybox) | [](https://microbadger.com/images/nixpkgs/busybox) | [](https://microbadger.com/images/nixpkgs/busybox:nixos-20.03) | [](https://microbadger.com/images/nixpkgs/busybox:nixos-19.09) | [](https://microbadger.com/images/nixpkgs/busybox:nixos-19.03) |
|
||||
| [nixpkgs/cachix](https://hub.docker.com/r/nixpkgs/cachix) | [](https://microbadger.com/images/nixpkgs/cachix) | [](https://microbadger.com/images/nixpkgs/cachix:nixos-20.03) | [](https://microbadger.com/images/nixpkgs/cachix:nixos-19.09) | [](https://microbadger.com/images/nixpkgs/cachix:nixos-19.03) |
|
||||
| [nixpkgs/cachix-flakes](https://hub.docker.com/r/nixpkgs/cachix-flakes) | [](https://microbadger.com/images/nixpkgs/cachix-flakes) | [](https://microbadger.com/images/nixpkgs/cachix-flakes:nixos-20.03) | [](https://microbadger.com/images/nixpkgs/cachix-flakes:nixos-19.09) | [](https://microbadger.com/images/nixpkgs/cachix-flakes:nixos-19.03) |
|
||||
| [nixpkgs/caddy](https://hub.docker.com/r/nixpkgs/caddy) | [](https://microbadger.com/images/nixpkgs/caddy) | [](https://microbadger.com/images/nixpkgs/caddy:nixos-20.03) | [](https://microbadger.com/images/nixpkgs/caddy:nixos-19.09) | [](https://microbadger.com/images/nixpkgs/caddy:nixos-19.03) |
|
||||
| [nixpkgs/couchpotato](https://hub.docker.com/r/nixpkgs/couchpotato) | [](https://microbadger.com/images/nixpkgs/couchpotato) | [](https://microbadger.com/images/nixpkgs/couchpotato:nixos-20.03) | [](https://microbadger.com/images/nixpkgs/couchpotato:nixos-19.09) | [](https://microbadger.com/images/nixpkgs/couchpotato:nixos-19.03) |
|
||||
| [nixpkgs/curl](https://hub.docker.com/r/nixpkgs/curl) | [](https://microbadger.com/images/nixpkgs/curl) | [](https://microbadger.com/images/nixpkgs/curl:nixos-20.03) | [](https://microbadger.com/images/nixpkgs/curl:nixos-19.09) | [](https://microbadger.com/images/nixpkgs/curl:nixos-19.03) |
|
||||
| [nixpkgs/devcontainer](https://hub.docker.com/r/nixpkgs/devcontainer) | [](https://microbadger.com/images/nixpkgs/devcontainer) | [](https://microbadger.com/images/nixpkgs/devcontainer:nixos-20.03) | [](https://microbadger.com/images/nixpkgs/devcontainer:nixos-19.09) | [](https://microbadger.com/images/nixpkgs/devcontainer:nixos-19.03) |
|
||||
| [nixpkgs/docker-compose](https://hub.docker.com/r/nixpkgs/docker-compose) | [](https://microbadger.com/images/nixpkgs/docker-compose) | [](https://microbadger.com/images/nixpkgs/docker-compose:nixos-20.03) | [](https://microbadger.com/images/nixpkgs/docker-compose:nixos-19.09) | [](https://microbadger.com/images/nixpkgs/docker-compose:nixos-19.03) |
|
||||
| [nixpkgs/hugo](https://hub.docker.com/r/nixpkgs/hugo) | [](https://microbadger.com/images/nixpkgs/hugo) | [](https://microbadger.com/images/nixpkgs/hugo:nixos-20.03) | [](https://microbadger.com/images/nixpkgs/hugo:nixos-19.09) | [](https://microbadger.com/images/nixpkgs/hugo:nixos-19.03) |
|
||||
| [nixpkgs/kubectl](https://hub.docker.com/r/nixpkgs/kubectl) | [](https://microbadger.com/images/nixpkgs/kubectl) | [](https://microbadger.com/images/nixpkgs/kubectl:nixos-20.03) | [](https://microbadger.com/images/nixpkgs/kubectl:nixos-19.09) | [](https://microbadger.com/images/nixpkgs/kubectl:nixos-19.03) |
|
||||
| [nixpkgs/kubernetes-helm](https://hub.docker.com/r/nixpkgs/kubernetes-helm) | [](https://microbadger.com/images/nixpkgs/kubernetes-helm) | [](https://microbadger.com/images/nixpkgs/kubernetes-helm:nixos-20.03) | [](https://microbadger.com/images/nixpkgs/kubernetes-helm:nixos-19.09) | [](https://microbadger.com/images/nixpkgs/kubernetes-helm:nixos-19.03) |
|
||||
| [nixpkgs/nginx](https://hub.docker.com/r/nixpkgs/nginx) | [](https://microbadger.com/images/nixpkgs/nginx) | [](https://microbadger.com/images/nixpkgs/nginx:nixos-20.03) | [](https://microbadger.com/images/nixpkgs/nginx:nixos-19.09) | [](https://microbadger.com/images/nixpkgs/nginx:nixos-19.03) |
|
||||
| [nixpkgs/nix](https://hub.docker.com/r/nixpkgs/nix) | [](https://microbadger.com/images/nixpkgs/nix) | [](https://microbadger.com/images/nixpkgs/nix:nixos-20.03) | [](https://microbadger.com/images/nixpkgs/nix:nixos-19.09) | [](https://microbadger.com/images/nixpkgs/nix:nixos-19.03) |
|
||||
| [nixpkgs/nix-flakes](https://hub.docker.com/r/nixpkgs/nix-flakes) | [](https://microbadger.com/images/nixpkgs/nix-flakes) | [](https://microbadger.com/images/nixpkgs/nix-flakes:nixos-20.03) | [](https://microbadger.com/images/nixpkgs/nix-flakes:nixos-19.09) | [](https://microbadger.com/images/nixpkgs/nix-flakes:nixos-19.03) |
|
||||
| [nixpkgs/nix-unstable](https://hub.docker.com/r/nixpkgs/nix-unstable) | [](https://microbadger.com/images/nixpkgs/nix-unstable) | [](https://microbadger.com/images/nixpkgs/nix-unstable:nixos-20.03) | [](https://microbadger.com/images/nixpkgs/nix-unstable:nixos-19.09) | [](https://microbadger.com/images/nixpkgs/nix-unstable:nixos-19.03) |
|
||||
| Image / Tag | latest | nixos-20.03 |
|
||||
| --- | --- | --- |
|
||||
| [nixpkgs/bash](https://hub.docker.com/r/nixpkgs/bash) | [](https://microbadger.com/images/nixpkgs/bash) | [](https://microbadger.com/images/nixpkgs/bash:nixos-20.03) |
|
||||
| [nixpkgs/busybox](https://hub.docker.com/r/nixpkgs/busybox) | [](https://microbadger.com/images/nixpkgs/busybox) | [](https://microbadger.com/images/nixpkgs/busybox:nixos-20.03) |
|
||||
| [nixpkgs/cachix](https://hub.docker.com/r/nixpkgs/cachix) | [](https://microbadger.com/images/nixpkgs/cachix) | [](https://microbadger.com/images/nixpkgs/cachix:nixos-20.03) |
|
||||
| [nixpkgs/cachix-flakes](https://hub.docker.com/r/nixpkgs/cachix-flakes) | [](https://microbadger.com/images/nixpkgs/cachix-flakes) | [](https://microbadger.com/images/nixpkgs/cachix-flakes:nixos-20.03) |
|
||||
| [nixpkgs/caddy](https://hub.docker.com/r/nixpkgs/caddy) | [](https://microbadger.com/images/nixpkgs/caddy) | [](https://microbadger.com/images/nixpkgs/caddy:nixos-20.03) |
|
||||
| [nixpkgs/couchpotato](https://hub.docker.com/r/nixpkgs/couchpotato) | [](https://microbadger.com/images/nixpkgs/couchpotato) | [](https://microbadger.com/images/nixpkgs/couchpotato:nixos-20.03) |
|
||||
| [nixpkgs/curl](https://hub.docker.com/r/nixpkgs/curl) | [](https://microbadger.com/images/nixpkgs/curl) | [](https://microbadger.com/images/nixpkgs/curl:nixos-20.03) |
|
||||
| [nixpkgs/devcontainer](https://hub.docker.com/r/nixpkgs/devcontainer) | [](https://microbadger.com/images/nixpkgs/devcontainer) | [](https://microbadger.com/images/nixpkgs/devcontainer:nixos-20.03) |
|
||||
| [nixpkgs/docker-compose](https://hub.docker.com/r/nixpkgs/docker-compose) | [](https://microbadger.com/images/nixpkgs/docker-compose) | [](https://microbadger.com/images/nixpkgs/docker-compose:nixos-20.03) |
|
||||
| [nixpkgs/hugo](https://hub.docker.com/r/nixpkgs/hugo) | [](https://microbadger.com/images/nixpkgs/hugo) | [](https://microbadger.com/images/nixpkgs/hugo:nixos-20.03) |
|
||||
| [nixpkgs/kubectl](https://hub.docker.com/r/nixpkgs/kubectl) | [](https://microbadger.com/images/nixpkgs/kubectl) | [](https://microbadger.com/images/nixpkgs/kubectl:nixos-20.03) |
|
||||
| [nixpkgs/kubernetes-helm](https://hub.docker.com/r/nixpkgs/kubernetes-helm) | [](https://microbadger.com/images/nixpkgs/kubernetes-helm) | [](https://microbadger.com/images/nixpkgs/kubernetes-helm:nixos-20.03) |
|
||||
| [nixpkgs/nginx](https://hub.docker.com/r/nixpkgs/nginx) | [](https://microbadger.com/images/nixpkgs/nginx) | [](https://microbadger.com/images/nixpkgs/nginx:nixos-20.03) |
|
||||
| [nixpkgs/nix](https://hub.docker.com/r/nixpkgs/nix) | [](https://microbadger.com/images/nixpkgs/nix) | [](https://microbadger.com/images/nixpkgs/nix:nixos-20.03) |
|
||||
| [nixpkgs/nix-flakes](https://hub.docker.com/r/nixpkgs/nix-flakes) | [](https://microbadger.com/images/nixpkgs/nix-flakes) | [](https://microbadger.com/images/nixpkgs/nix-flakes:nixos-20.03) |
|
||||
| [nixpkgs/nix-unstable](https://hub.docker.com/r/nixpkgs/nix-unstable) | [](https://microbadger.com/images/nixpkgs/nix-unstable) | [](https://microbadger.com/images/nixpkgs/nix-unstable:nixos-20.03) |
|
||||
<!-- END mdsh -->
|
||||
## Adding new images
|
||||
|
||||
|
|
|
|||
|
|
@ -23,10 +23,10 @@ microbadge() {
|
|||
|
||||
releases_json=$(nix-instantiate --strict --eval --json)
|
||||
|
||||
echo "| Image / Tag | latest | nixos-20.03 | nixos-19.09 | nixos-19.03 |"
|
||||
echo "| --- | --- | --- | --- | --- |"
|
||||
echo "| Image / Tag | latest | nixos-20.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-20.03") | $(microbadge "$name" "nixos-19.09") | $(microbadge "$name" "nixos-19.03") |"
|
||||
echo "| [$name](https://hub.docker.com/r/$name) | $(microbadge "$name") | $(microbadge "$name" "nixos-20.03") |"
|
||||
done
|
||||
|
|
|
|||
|
|
@ -112,11 +112,13 @@ let
|
|||
"PAGER=less"
|
||||
"PATH=/nix/var/nix/profiles/default/bin"
|
||||
"SSL_CERT_FILE=/nix/var/nix/profiles/default/etc/ssl/certs/ca-bundle.crt"
|
||||
]
|
||||
++ lib.optional
|
||||
(channel != "")
|
||||
"NIX_PATH=nixpkgs=channel:${channel}"
|
||||
;
|
||||
(
|
||||
if channel != "" then
|
||||
"NIX_PATH=nixpkgs=channel:${channel}"
|
||||
else
|
||||
"NIX_PATH=nixpkgs=${../nix/fake_nixpkgs}"
|
||||
)
|
||||
];
|
||||
Labels = {
|
||||
# https://github.com/microscaling/microscaling/blob/55a2d7b91ce7513e07f8b1fd91bbed8df59aed5a/Dockerfile#L22-L33
|
||||
"org.label-schema.vcs-ref" = "master";
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
let
|
||||
nixpkgs = builtins.fetchTarball "channel:nixos-19.09";
|
||||
nixpkgs = builtins.fetchTarball "channel:nixos-20.03";
|
||||
pkgs = import nixpkgs { config = {}; overlays = []; };
|
||||
in
|
||||
with pkgs;
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue