Skip to content

Commit 9d30643

Browse files
committed
switch to golang:1.17 in Dockerfile, actualize documentation operator_build_from_sources.md
1 parent cf28e72 commit 9d30643

File tree

5 files changed

+25
-13
lines changed

5 files changed

+25
-13
lines changed

dockerfile/metrics-exporter/Dockerfile

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,13 @@
22
# ===== Builder =====
33
# ====================
44

5-
FROM golang:1.13 AS builder
5+
FROM golang:1.17 AS builder
66

77
# Install required packages
8-
RUN apt-get update && apt-get install -y apt-utils gettext-base
8+
RUN echo "deb http://ppa.launchpad.net/rmescandon/yq/ubuntu focal main" > /etc/apt/sources.list.d/yq.list && \
9+
echo "deb-src http://ppa.launchpad.net/rmescandon/yq/ubuntu focal main" >> /etc/apt/sources.list.d/yq.list && \
10+
apt-key adv --keyserver keyserver.ubuntu.com --recv-keys CC86BB64
11+
RUN apt-get update && apt-get install -y apt-utils gettext-base yq
912

1013
# Reconstruct source tree inside docker
1114
WORKDIR /clickhouse-operator

dockerfile/metrics-exporter/template/Dockerfile

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,13 @@
22
# ===== Builder =====
33
# ====================
44

5-
FROM golang:1.13 AS builder
5+
FROM golang:1.17 AS builder
66

77
# Install required packages
8-
RUN apt-get update && apt-get install -y apt-utils gettext-base
8+
RUN echo "deb http://ppa.launchpad.net/rmescandon/yq/ubuntu focal main" > /etc/apt/sources.list.d/yq.list && \
9+
echo "deb-src http://ppa.launchpad.net/rmescandon/yq/ubuntu focal main" >> /etc/apt/sources.list.d/yq.list && \
10+
apt-key adv --keyserver keyserver.ubuntu.com --recv-keys CC86BB64
11+
RUN apt-get update && apt-get install -y apt-utils gettext-base yq
912

1013
# Reconstruct source tree inside docker
1114
WORKDIR /clickhouse-operator

dockerfile/operator/Dockerfile

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,13 @@
22
# ===== Builder =====
33
# ===================
44

5-
FROM golang:1.13 AS builder
5+
FROM golang:1.17 AS builder
66

77
# Install required packages
8-
RUN apt-get update && apt-get install -y apt-utils gettext-base
8+
RUN echo "deb http://ppa.launchpad.net/rmescandon/yq/ubuntu focal main" > /etc/apt/sources.list.d/yq.list && \
9+
echo "deb-src http://ppa.launchpad.net/rmescandon/yq/ubuntu focal main" >> /etc/apt/sources.list.d/yq.list && \
10+
apt-key adv --keyserver keyserver.ubuntu.com --recv-keys CC86BB64
11+
RUN apt-get update && apt-get install -y apt-utils gettext-base yq
912

1013
# Reconstruct source tree inside docker
1114
WORKDIR /clickhouse-operator

dockerfile/operator/template/Dockerfile

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,13 @@
22
# ===== Builder =====
33
# ===================
44

5-
FROM golang:1.13 AS builder
5+
FROM golang:1.17 AS builder
66

77
# Install required packages
8-
RUN apt-get update && apt-get install -y apt-utils gettext-base
8+
RUN echo "deb http://ppa.launchpad.net/rmescandon/yq/ubuntu focal main" > /etc/apt/sources.list.d/yq.list && \
9+
echo "deb-src http://ppa.launchpad.net/rmescandon/yq/ubuntu focal main" >> /etc/apt/sources.list.d/yq.list && \
10+
apt-key adv --keyserver keyserver.ubuntu.com --recv-keys CC86BB64
11+
RUN apt-get update && apt-get install -y apt-utils gettext-base yq
912

1013
# Reconstruct source tree inside docker
1114
WORKDIR /clickhouse-operator

docs/operator_build_from_sources.md

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,9 @@
1616

1717
This process does not require `go-lang` compiler nor `dep` package manager. Instead it requires `kubernetes` and `docker`.
1818

19-
1. Switch working dir to `src/github.com/altinity/clickhouse-operator`
20-
2. Build docker image with `docker`: `docker build -t altinity/clickhouse-operator ./`
21-
3. Register freshly build `docker` image inside `kubernetes` environment like so: `docker save altinity/clickhouse-operator | (eval $(minikube docker-env) && docker load)`
22-
4. Install `clickhouse-operator` as described here: [Install ClickHouse Operator][install]
19+
* Switch working dir to `src/github.com/altinity/clickhouse-operator`
20+
* Build docker image with `docker`: `docker build -t altinity/clickhouse-operator -f ./dockerfile/operator/Dockerfile ./`
21+
* Register freshly build `docker` image inside `kubernetes` environment like so: `docker save altinity/clickhouse-operator | (eval $(minikube docker-env) && docker load)`
22+
* Install `clickhouse-operator` as described here: [Install ClickHouse Operator][install]
2323

24-
[install]: ./operator_installation_details.md
24+
[install]: ./operator_installation_details.md

0 commit comments

Comments
 (0)