Merge branch 'release/0.2.2'
This commit is contained in:
commit
ca4263d913
9 changed files with 17 additions and 16 deletions
|
|
@ -1,6 +1,7 @@
|
|||
---
|
||||
kind: pipeline
|
||||
name: default
|
||||
type: docker
|
||||
|
||||
steps:
|
||||
- name: pytest
|
||||
|
|
@ -14,7 +15,7 @@ steps:
|
|||
- name: docker
|
||||
image: plugins/docker
|
||||
settings:
|
||||
repo: ldericher/kind
|
||||
repo: yavook/kind
|
||||
auto_tag: true
|
||||
# tags:
|
||||
# - edge
|
||||
|
|
|
|||
2
LICENSE
2
LICENSE
|
|
@ -1,6 +1,6 @@
|
|||
MIT License
|
||||
|
||||
Copyright (c) 2020 Jörn-Michael Miehe
|
||||
Copyright (c) 2020 yavook.de
|
||||
|
||||
Permission is hereby granted, free of charge, to any person obtaining a copy
|
||||
of this software and associated documentation files (the "Software"), to deal
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
# kiwi-scp
|
||||
|
||||
[](https://github.drone.yavook.de/ldericher/kiwi-scp)
|
||||
[](https://github.drone.yavook.de/yavook/kiwi-scp)
|
||||
|
||||
> `kiwi` - simple, consistent, powerful
|
||||
|
||||
|
|
@ -22,7 +22,7 @@ A convenience installer is available as [install.sh](./dist/install.sh) in the `
|
|||
You can `curl | sh` it using the following one-liner.
|
||||
|
||||
```shell script
|
||||
curl --proto '=https' --tlsv1.2 -sSf 'https://raw.githubusercontent.com/ldericher/kiwi-scp/master/dist/install.sh' | sh
|
||||
curl --proto '=https' --tlsv1.2 -sSf 'https://raw.githubusercontent.com/yavook/kiwi-scp/master/dist/install.sh' | sh
|
||||
```
|
||||
|
||||
The installer downloads the `kiwi` launcher script and installs it to a location of your choice.
|
||||
|
|
@ -122,7 +122,7 @@ In your `docker-compose.yml` files, you can refer to that directory as **${KIWI_
|
|||
##### `version`
|
||||
Version of kiwi-scp to use for this instance.
|
||||
|
||||
Default: Version of [`master` branch](https://github.com/ldericher/kiwi-scp/tree/master).
|
||||
Default: Version of [`master` branch](https://github.com/yavook/kiwi-scp/tree/master).
|
||||
|
||||
##### `shells`
|
||||
Sequence of additionally preferable shell executables when entering service containers.
|
||||
|
|
|
|||
2
dist/install.sh
vendored
2
dist/install.sh
vendored
|
|
@ -7,7 +7,7 @@
|
|||
# default installation directory
|
||||
INSTALL_DIR_DEFAULT="/usr/local/sbin"
|
||||
# URI of "kiwi" launcher script
|
||||
KIWI_URI="https://raw.githubusercontent.com/ldericher/kiwi-scp/master/dist/kiwi"
|
||||
KIWI_URI="https://raw.githubusercontent.com/yavook/kiwi-scp/master/dist/kiwi"
|
||||
|
||||
#############
|
||||
# FUNCTIONS #
|
||||
|
|
|
|||
6
dist/kiwi
vendored
6
dist/kiwi
vendored
|
|
@ -15,8 +15,8 @@ KIWI_BASEDIR="${HOME}/.cache/kiwi-scp"
|
|||
KIWI_PROFILE="${HOME}/.kiwi_profile"
|
||||
|
||||
# repository uri
|
||||
KIWI_REPO="https://github.com/ldericher/kiwi-scp"
|
||||
KIWI_REPO_RAW="https://raw.githubusercontent.com/ldericher/kiwi-scp"
|
||||
KIWI_REPO="https://github.com/yavook/kiwi-scp"
|
||||
KIWI_REPO_RAW="https://raw.githubusercontent.com/yavook/kiwi-scp"
|
||||
# use latest version by default
|
||||
KIWI_VERSION="master"
|
||||
|
||||
|
|
@ -142,7 +142,7 @@ if [ "${run_kiwi_check}" = "yes" ]; then
|
|||
echo "" >/dev/stderr
|
||||
echo "####################" >/dev/stderr
|
||||
echo "Please manually update your kiwi launcher by re-running the installation process:" >/dev/stderr
|
||||
echo "https://github.com/ldericher/kiwi-scp/#installation" >/dev/stderr
|
||||
echo "https://github.com/yavook/kiwi-scp/#installation" >/dev/stderr
|
||||
echo "####################" >/dev/stderr
|
||||
echo "" >/dev/stderr
|
||||
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@
|
|||
# kiwi-scp instance configuration #
|
||||
###################################
|
||||
|
||||
version: 0.2.1
|
||||
version: 0.2.2
|
||||
|
||||
shells:
|
||||
- /bin/bash
|
||||
|
|
|
|||
|
|
@ -164,7 +164,7 @@ class MissingMemberError(ValueError):
|
|||
class KiwiConfig(BaseModel):
|
||||
"""represents a kiwi.yml"""
|
||||
|
||||
version: constr(regex=RE_SEMVER) = "0.2.1"
|
||||
version: constr(regex=RE_SEMVER) = "0.2.2"
|
||||
|
||||
shells: List[Path] = [
|
||||
Path("/bin/bash"),
|
||||
|
|
|
|||
6
poetry.lock
generated
6
poetry.lock
generated
|
|
@ -289,7 +289,7 @@ python-versions = ">=3.6"
|
|||
|
||||
[[package]]
|
||||
name = "virtualenv"
|
||||
version = "20.13.1"
|
||||
version = "20.13.2"
|
||||
description = "Virtual Python Environment builder"
|
||||
category = "dev"
|
||||
optional = false
|
||||
|
|
@ -531,8 +531,8 @@ typing-extensions = [
|
|||
{file = "typing_extensions-4.1.1.tar.gz", hash = "sha256:1a9462dcc3347a79b1f1c0271fbe79e844580bb598bafa1ed208b94da3cdcd42"},
|
||||
]
|
||||
virtualenv = [
|
||||
{file = "virtualenv-20.13.1-py2.py3-none-any.whl", hash = "sha256:45e1d053cad4cd453181ae877c4ffc053546ae99e7dd049b9ff1d9be7491abf7"},
|
||||
{file = "virtualenv-20.13.1.tar.gz", hash = "sha256:e0621bcbf4160e4e1030f05065c8834b4e93f4fcc223255db2a823440aca9c14"},
|
||||
{file = "virtualenv-20.13.2-py2.py3-none-any.whl", hash = "sha256:e7b34c9474e6476ee208c43a4d9ac1510b041c68347eabfe9a9ea0c86aa0a46b"},
|
||||
{file = "virtualenv-20.13.2.tar.gz", hash = "sha256:01f5f80744d24a3743ce61858123488e91cb2dd1d3bdf92adaf1bba39ffdedf0"},
|
||||
]
|
||||
wcwidth = [
|
||||
{file = "wcwidth-0.2.5-py2.py3-none-any.whl", hash = "sha256:beb4802a9cebb9144e99086eff703a642a13d6a0052920003a230f3294bbe784"},
|
||||
|
|
|
|||
|
|
@ -1,8 +1,8 @@
|
|||
[tool.poetry]
|
||||
name = "kiwi-scp"
|
||||
version = "0.2.1"
|
||||
version = "0.2.2"
|
||||
description = "kiwi is the simple tool for managing container servers."
|
||||
authors = ["ldericher <40151420+ldericher@users.noreply.github.com>"]
|
||||
authors = ["LDericher <40151420+ldericher@users.noreply.github.com>"]
|
||||
|
||||
[tool.poetry.dependencies]
|
||||
python = "^3.6.1"
|
||||
|
|
|
|||
Loading…
Reference in a new issue