mirrors/etcd
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Consolidate etcd dockerfiles.

Browse Source 
We can consolidate by using docker build args to create the individual platform Dockerfile.

Signed-off-by: James Blair <mail@jamesblair.net>
This commit is contained in:
James Blair 2023-04-26 17:09:25 +12:00
parent 4485db379e
commit ab65ee3d01
No known key found for this signature in database
6 changed files with 7 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Dockerfile-release.amd64 → Dockerfile
View File

@ -1,4 +1,5 @@
FROM --platform=linux/amd64 gcr.io/distroless/static-debian11 ARG ARCH=amd64
FROM --platform=linux/${ARCH} gcr.io/distroless/static-debian11
ADD etcd /usr/local/bin/ ADD etcd /usr/local/bin/
ADD etcdctl /usr/local/bin/ ADD etcdctl /usr/local/bin/

13
Dockerfile-release.arm64
View File

@ -1,13 +0,0 @@
FROM --platform=linux/arm64 gcr.io/distroless/static-debian11
ADD etcd /usr/local/bin/
ADD etcdctl /usr/local/bin/
ADD etcdutl /usr/local/bin/
WORKDIR /var/etcd/
WORKDIR /var/lib/etcd/
EXPOSE 2379 2380
# Define default command.
CMD ["/usr/local/bin/etcd"]

13
Dockerfile-release.ppc64le
View File

@ -1,13 +0,0 @@
FROM --platform=linux/ppc64le gcr.io/distroless/static-debian11
ADD etcd /usr/local/bin/
ADD etcdctl /usr/local/bin/
ADD etcdutl /usr/local/bin/
WORKDIR /var/etcd/
WORKDIR /var/lib/etcd/
EXPOSE 2379 2380
# Define default command.
CMD ["/usr/local/bin/etcd"]

13
Dockerfile-release.s390x
View File

@ -1,13 +0,0 @@
FROM --platform=linux/s390x gcr.io/distroless/static-debian11
ADD etcd /usr/local/bin/
ADD etcdctl /usr/local/bin/
ADD etcdutl /usr/local/bin/
WORKDIR /var/etcd/
WORKDIR /var/lib/etcd/
EXPOSE 2379 2380
# Define default command.
CMD ["/usr/local/bin/etcd"]

2
Makefile
View File

@ -137,7 +137,7 @@ verify-goimport:
clean: clean:
rm -f ./codecov rm -f ./codecov
rm -rf ./covdir rm -rf ./covdir
rm -f ./bin/Dockerfile-release* rm -f ./bin/Dockerfile-release
rm -rf ./bin/etcd* rm -rf ./bin/etcd*
rm -rf ./default.etcd rm -rf ./default.etcd
rm -rf ./tests/e2e/default.etcd rm -rf ./tests/e2e/default.etcd

8
scripts/build-docker.sh
View File

@ -15,10 +15,10 @@ fi
ARCH=$(go env GOARCH) ARCH=$(go env GOARCH)
VERSION="${VERSION}-${ARCH}" VERSION="${VERSION}-${ARCH}"
DOCKERFILE="Dockerfile-release.${ARCH}" DOCKERFILE="Dockerfile"
if [ -z "${BINARYDIR:-}" ]; then if [ -z "${BINARYDIR:-}" ]; then
RELEASE="etcd-${1}"-$(go env GOOS)-$(go env GOARCH) RELEASE="etcd-${1}"-$(go env GOOS)-${ARCH}
BINARYDIR="${RELEASE}" BINARYDIR="${RELEASE}"
TARFILE="${RELEASE}.tar.gz" TARFILE="${RELEASE}.tar.gz"
TARURL="https://github.com/etcd-io/etcd/releases/download/${1}/${TARFILE}" TARURL="https://github.com/etcd-io/etcd/releases/download/${1}/${TARFILE}"
@ -43,8 +43,8 @@ cat ./"${DOCKERFILE}" > "${IMAGEDIR}"/Dockerfile
if [ -z "${TAG:-}" ]; then if [ -z "${TAG:-}" ]; then
# Fix incorrect image "Architecture" using buildkit # Fix incorrect image "Architecture" using buildkit
# From https://stackoverflow.com/q/72144329/ # From https://stackoverflow.com/q/72144329/
DOCKER_BUILDKIT=1 docker build -t "gcr.io/etcd-development/etcd:${VERSION}" "${IMAGEDIR}" DOCKER_BUILDKIT=1 docker build --build-arg="ARCH=${ARCH}" -t "gcr.io/etcd-development/etcd:${VERSION}" "${IMAGEDIR}"
DOCKER_BUILDKIT=1 docker build -t "quay.io/coreos/etcd:${VERSION}" "${IMAGEDIR}" DOCKER_BUILDKIT=1 docker build --build-arg="ARCH=${ARCH}" -t "quay.io/coreos/etcd:${VERSION}" "${IMAGEDIR}"
else else
docker build -t "${TAG}:${VERSION}" "${IMAGEDIR}" docker build -t "${TAG}:${VERSION}" "${IMAGEDIR}"
fi fi