Skip to content

Commit 82f368d

Browse files
committed
Update Dockerfile to latest standards
1 parent 6213481 commit 82f368d

File tree

2 files changed

+20
-20
lines changed

2 files changed

+20
-20
lines changed

examples/deployment/kubernetes/mysql/image/Dockerfile

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -17,16 +17,16 @@ FROM ubuntu:jammy@sha256:4e0171b9275e12d375863f2b3ae9ce00a4c53ddda176bd55868df97
1717

1818
# Patch the OS-level packages and remove unneeded dependencies.
1919
RUN apt-get update \
20-
&& apt-get -y upgrade \
21-
&& apt-get -y autoremove \
22-
&& rm -rf /var/lib/apt/lists/*
20+
&& apt-get -y upgrade \
21+
&& apt-get -y autoremove \
22+
&& rm -rf /var/lib/apt/lists/*
2323

2424
# add our user and group first to make sure their IDs get assigned
2525
# consistently, regardless of whatever dependencies get added
2626
RUN groupadd -r mysql && useradd -r -g mysql mysql
2727

28-
ENV MYSQL_VERSION 8.0
29-
ENV TERM linux
28+
ENV MYSQL_VERSION=8.0
29+
ENV TERM=linux
3030

3131
# Install perl.
3232
# Install dig, for discovering IP addresses of other Galera nodes.
@@ -39,11 +39,11 @@ RUN echo "deb http://repo.percona.com/apt jammy main" > /etc/apt/sources.list.d/
3939
RUN echo "deb-src http://repo.percona.com/apt jammy main" >> /etc/apt/sources.list.d/percona.list
4040

4141
RUN { \
42-
echo percona-server-server-${MYSQL_VERSION} percona-server-server/root_password password ''; \
43-
} | debconf-set-selections \
44-
&& apt-get update && DEBIAN_FRONTEND=noninteractive apt-get install -y percona-xtradb-cluster-client-"${MYSQL_VERSION}" \
45-
percona-xtradb-cluster-common-"${MYSQL_VERSION}" percona-xtradb-cluster-server-"${MYSQL_VERSION}" \
46-
&& rm -rf /var/lib/apt/lists/*
42+
echo percona-server-server-${MYSQL_VERSION} percona-server-server/root_password password ''; \
43+
} | debconf-set-selections \
44+
&& apt-get update && DEBIAN_FRONTEND=noninteractive apt-get install -y percona-xtradb-cluster-client-"${MYSQL_VERSION}" \
45+
percona-xtradb-cluster-common-"${MYSQL_VERSION}" percona-xtradb-cluster-server-"${MYSQL_VERSION}" \
46+
&& rm -rf /var/lib/apt/lists/*
4747

4848
COPY my.cnf /etc/mysql/my.cnf
4949
COPY cluster.cnf /etc/mysql/conf.d/cluster.cnf

integration/cloudbuild/testbase/Dockerfile

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ WORKDIR /testbase
55

66
ARG GOFLAGS=""
77
ENV GOFLAGS=$GOFLAGS
8-
ENV GOPATH /go
8+
ENV GOPATH=/go
99

1010
RUN apt-get update && apt-get install -y \
1111
build-essential \
@@ -27,13 +27,13 @@ RUN curl -sSfL https://raw.githubusercontent.com/golangci/golangci-lint/master/i
2727
RUN curl https://binaries.cockroachdb.com/cockroach-v22.2.7.linux-amd64.tgz | tar -xz && cp -i cockroach-v22.2.7.linux-amd64/cockroach /usr/local/bin/
2828

2929
RUN mkdir protoc && \
30-
(cd protoc && \
31-
PROTOC_VERSION="3.20.1" && \
32-
PROTOC_ZIP="protoc-${PROTOC_VERSION}-linux-x86_64.zip" && \
33-
wget "https://github.com/google/protobuf/releases/download/v${PROTOC_VERSION}/${PROTOC_ZIP}" && \
34-
unzip -o ${PROTOC_ZIP} -d /usr/local bin/protoc && \
35-
unzip -o ${PROTOC_ZIP} -d /usr/local 'include/*' \
36-
)
37-
ENV PATH /usr/local/bin:$PATH
30+
(cd protoc && \
31+
PROTOC_VERSION="3.20.1" && \
32+
PROTOC_ZIP="protoc-${PROTOC_VERSION}-linux-x86_64.zip" && \
33+
wget "https://github.com/google/protobuf/releases/download/v${PROTOC_VERSION}/${PROTOC_ZIP}" && \
34+
unzip -o ${PROTOC_ZIP} -d /usr/local bin/protoc && \
35+
unzip -o ${PROTOC_ZIP} -d /usr/local 'include/*' \
36+
)
37+
ENV PATH=/usr/local/bin:$PATH
3838

39-
ENV PATH $GOPATH/bin:/testbase/protoc/bin:$PATH
39+
ENV PATH=$GOPATH/bin:/testbase/protoc/bin:$PATH

0 commit comments

Comments
 (0)