valitydev/holmes
14
0
Fork 0
mirror of https://github.com/valitydev/holmes.git synced 2024-11-06 01:45:25 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix keyringer script

Browse Source 
bump psql
This commit is contained in:
vilorij 2023-12-08 18:29:07 +07:00 committed by GitHub
parent 24e79edfc5
commit fe5be42fb5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
Dockerfile
View File

@ -9,7 +9,9 @@ RUN ./clone-proto-modules.sh /repos
FROM docker.io/library/erlang:${OTP_VERSION}
RUN apt-get --yes update \
RUN curl -fSsL https://www.postgresql.org/media/keys/ACCC4CF8.asc | gpg --dearmor | tee /usr/share/keyrings/postgresql.gpg > /dev/null \
&& echo deb [arch=amd64,arm64,ppc64el signed-by=/usr/share/keyrings/postgresql.gpg] http://apt.postgresql.org/pub/repos/apt/ $(lsb_release -cs)-pgdg main | tee /etc/apt/sources.list.d/postgresql.list \
&& apt-get --yes update \
&& apt-get --yes --no-install-recommends install \
curl \
bind9-dnsutils \
@ -21,9 +23,11 @@ RUN apt-get --yes update \
nano \
netcat-openbsd \
jq \
postgresql-client-13 \
python3-pip \
postgresql-client-15 \
&& apt-get clean \
&& rm -rf /var/lib/apt/lists/*
&& rm -rf /var/lib/apt/lists/* \
&& pip install six
# step-cli
ARG STEP_VERSION

4
scripts/cds/keyring.py
View File

@ -58,7 +58,7 @@ def call(args, raw=False, stdin=""):
def call_keyring(cds_address, func, *args):
thrift_port = os.environ["THRIFT_PORT"]
thrift_port = os.environ.get("THRIFT_PORT",8022)
json_args = [json.dumps(arg) for arg in args]
woorl_args = \
[
@ -136,7 +136,7 @@ def get_state(cds_address):
def main(argv):
address = os.environ["CDS"]
address = os.environ.get("CDS","kds")
help_promt = "usage: keyring.py {init | unlock | state}" \
" [-h | --help | -a <woorl address>| --address <woorl address>]"
try: