Bump tinkerbell stack to newest versions

Signed-off-by: Gianluca Arbezzano <gianarb92@gmail.com>
This commit is contained in:
Gianluca Arbezzano 2020-11-12 14:38:25 +01:00
parent 09adeb815f
commit 1c4f829252
2 changed files with 30 additions and 6 deletions

View File

@ -20,6 +20,8 @@ services:
TINK_AUTH_USERNAME: ${TINKERBELL_TINK_USERNAME} TINK_AUTH_USERNAME: ${TINKERBELL_TINK_USERNAME}
TINK_AUTH_PASSWORD: ${TINKERBELL_TINK_PASSWORD} TINK_AUTH_PASSWORD: ${TINKERBELL_TINK_PASSWORD}
depends_on: depends_on:
tink-server-migration:
condition: service_started
db: db:
condition: service_healthy condition: service_healthy
healthcheck: healthcheck:
@ -33,6 +35,28 @@ services:
- 42113:42113/tcp - 42113:42113/tcp
- 42114:42114/tcp - 42114:42114/tcp
tink-server-migration:
image: ${TINKERBELL_TINK_SERVER_IMAGE}
restart: on-failure
environment:
ONLY_MIGRATION: "true"
FACILITY: ${FACILITY:-onprem}
PGDATABASE: tinkerbell
PGHOST: db
PGPASSWORD: tinkerbell
PGPORT: 5432
PGSSLMODE: disable
PGUSER: tinkerbell
TINKERBELL_GRPC_AUTHORITY: :42113
TINKERBELL_HTTP_AUTHORITY: :42114
TINK_AUTH_USERNAME: ${TINKERBELL_TINK_USERNAME}
TINK_AUTH_PASSWORD: ${TINKERBELL_TINK_PASSWORD}
depends_on:
db:
condition: service_healthy
volumes:
- ./state/certs:/certs/${FACILITY:-onprem}
db: db:
image: postgres:10-alpine image: postgres:10-alpine
restart: unless-stopped restart: unless-stopped

View File

@ -54,12 +54,12 @@ generate_envrc() (
cat <<EOF cat <<EOF
# Tinkerbell Stack version # Tinkerbell Stack version
export OSIE_DOWNLOAD_LINK=https://tinkerbell-oss.s3.amazonaws.com/osie-uploads/osie-v0-n=252,c=bc454bc,b=master.tar.gz export OSIE_DOWNLOAD_LINK=https://tinkerbell-oss.s3.amazonaws.com/osie-uploads/osie-v0-n=366,c=1aec189,b=master.tar.gz
export TINKERBELL_TINK_SERVER_IMAGE=quay.io/tinkerbell/tink:sha-adb49da export TINKERBELL_TINK_SERVER_IMAGE=quay.io/tinkerbell/tink:sha-0e8e5733
export TINKERBELL_TINK_CLI_IMAGE=quay.io/tinkerbell/tink-cli:sha-adb49da export TINKERBELL_TINK_CLI_IMAGE=quay.io/tinkerbell/tink-cli:sha-0e8e5733
export TINKERBELL_TINK_BOOTS_IMAGE=quay.io/tinkerbell/boots:327-58ab49913b5498908b16e2607d265a61a05f73b6 export TINKERBELL_TINK_BOOTS_IMAGE=quay.io/tinkerbell/boots:sha-e81a291c
export TINKERBELL_TINK_HEGEL_IMAGE=quay.io/tinkerbell/hegel:196-fa897aa020769db8becb9be29adaeb6be92a7fc7 export TINKERBELL_TINK_HEGEL_IMAGE=quay.io/tinkerbell/hegel:sha-c17b512f
export TINKERBELL_TINK_WORKER_IMAGE=quay.io/tinkerbell/tink-worker:sha-adb49da export TINKERBELL_TINK_WORKER_IMAGE=quay.io/tinkerbell/tink-worker:sha-0e8e5733
# Network interface for Tinkerbell's network # Network interface for Tinkerbell's network
export TINKERBELL_NETWORK_INTERFACE="$tink_interface" export TINKERBELL_NETWORK_INTERFACE="$tink_interface"