Skip to content

Commit

Permalink
tests: update base image for ci dockerfile (#1370)
Browse files Browse the repository at this point in the history
  • Loading branch information
AstroProfundis authored May 20, 2021
1 parent 49ee71a commit 2faf4c9
Show file tree
Hide file tree
Showing 6 changed files with 14 additions and 8 deletions.
12 changes: 6 additions & 6 deletions docker/README.md
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
# Dockerized tiops
# Dockerized tiup-cluster

This docker image attempts to simplify the setup required by tiops.
It is intended to be used by a CI tool or anyone with docker who wants to try tiops themselves.
This docker image attempts to simplify the setup required by tiup-cluster.
It is intended to be used by a CI tool or anyone with docker who wants to try tiup-cluster themselves.

It contains all the tiops dependencies and code. It uses [Docker Compose](https://github.com/docker/compose) to spin up the five
containers used by tiops.
It contains all the tiup-cluster dependencies and code. It uses [Docker Compose](https://github.com/docker/compose) to spin up the five
containers used by tiup-cluster.

To start run

Expand All @@ -13,6 +13,6 @@ To start run
docker exec -it tiup-cluster-control bash
```

During development, it's convenient to run with `--dev` option, which mounts `$TIUP_CLUSTER_ROOT` dir as `/tiops` on tiops control container.
During development, it's convenient to run with `--dev` option, which mounts `$TIUP_CLUSTER_ROOT` dir as `/tiup-cluster` on tiup-cluster control container.

Run `./up.sh --help` for more info.
2 changes: 1 addition & 1 deletion docker/control/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM golang:1.14
FROM golang:1.16


# Use mirrors for poor network...
Expand Down
2 changes: 1 addition & 1 deletion docker/node/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# Based on the deprecated `https://github.com/tutumcloud/tutum-debian`
FROM golang:1.14
FROM golang:1.16

# Use mirrors for poor network...
#RUN sed -i 's/deb.debian.org/mirrors.aliyun.com/g' /etc/apt/sources.list && \
Expand Down
2 changes: 2 additions & 0 deletions tests/tiup-cluster/script/cmd_subtest.sh
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
#!/bin/bash

set -eu

function cmd_subtest() {
mkdir -p ~/.tiup/bin/

Expand Down
2 changes: 2 additions & 0 deletions tests/tiup-cluster/script/scale_core.sh
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
#!/bin/bash

set -eu

function scale_core() {
mkdir -p ~/.tiup/bin/

Expand Down
2 changes: 2 additions & 0 deletions tests/tiup-cluster/script/scale_tools.sh
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
#!/bin/bash

set -eu

function scale_tools() {
mkdir -p ~/.tiup/bin/

Expand Down

0 comments on commit 2faf4c9

Please sign in to comment.