feat(libstack): remove the docker-compose binary BE-10801 (#111)
Co-authored-by: andres-portainer <andres-portainer@users.noreply.github.com> Co-authored-by: oscarzhou <oscar.zhou@portainer.io>
This commit is contained in:
@@ -8,17 +8,15 @@ ARCH=${2:-"amd64"}
|
||||
BINARY_VERSION_FILE="./binary-version.json"
|
||||
|
||||
dockerVersion=$(jq -r '.docker' < "${BINARY_VERSION_FILE}")
|
||||
dockerComposeVersion=$(jq -r '.dockerCompose' < "${BINARY_VERSION_FILE}")
|
||||
helmVersion=$(jq -r '.helm' < "${BINARY_VERSION_FILE}")
|
||||
kubectlVersion=$(jq -r '.kubectl' < "${BINARY_VERSION_FILE}")
|
||||
mingitVersion=$(jq -r '.mingit' < "${BINARY_VERSION_FILE}")
|
||||
|
||||
mkdir -p dist
|
||||
|
||||
echo "Downloading binaries for docker ${dockerVersion}, docker-compose ${dockerComposeVersion}, helm ${helmVersion}, kubectl ${kubectlVersion}, and mingit ${mingitVersion}"
|
||||
echo "Downloading binaries for docker ${dockerVersion}, helm ${helmVersion}, kubectl ${kubectlVersion} and mingit ${mingitVersion}"
|
||||
|
||||
./build/download_docker_binary.sh "$PLATFORM" "$ARCH" "$dockerVersion" &
|
||||
./build/download_docker_compose_binary.sh "$PLATFORM" "$ARCH" "$dockerComposeVersion" &
|
||||
./build/download_helm_binary.sh "$PLATFORM" "$ARCH" "$helmVersion" &
|
||||
./build/download_kubectl_binary.sh "$PLATFORM" "$ARCH" "$kubectlVersion" &
|
||||
./build/download_mingit_binary.sh "$PLATFORM" "$ARCH" "$mingitVersion" &
|
||||
|
||||
@@ -1,30 +0,0 @@
|
||||
#!/usr/bin/env bash
|
||||
set -euo pipefail
|
||||
|
||||
if [[ $# -ne 3 ]]; then
|
||||
echo "Illegal number of parameters" >&2
|
||||
exit 1
|
||||
fi
|
||||
|
||||
PLATFORM=$1
|
||||
ARCH=$2
|
||||
COMPOSE_VERSION=$3
|
||||
|
||||
|
||||
if [[ ${ARCH} == "amd64" ]]; then
|
||||
ARCH="x86_64"
|
||||
elif [[ ${ARCH} == "arm" ]]; then
|
||||
ARCH="armv7"
|
||||
elif [[ ${ARCH} == "arm64" ]]; then
|
||||
ARCH="aarch64"
|
||||
fi
|
||||
|
||||
|
||||
if [[ "$PLATFORM" == "windows" ]]; then
|
||||
wget --tries=3 --waitretry=30 --quiet -O "dist/docker-compose.exe" "https://github.com/docker/compose/releases/download/$COMPOSE_VERSION/docker-compose-windows-${ARCH}.exe"
|
||||
chmod +x "dist/docker-compose.exe"
|
||||
else
|
||||
wget --tries=3 --waitretry=30 --quiet -O "dist/docker-compose" "https://github.com/docker/compose/releases/download/$COMPOSE_VERSION/docker-compose-${PLATFORM}-${ARCH}"
|
||||
chmod +x "dist/docker-compose"
|
||||
fi
|
||||
|
||||
@@ -11,7 +11,6 @@ LABEL org.opencontainers.image.title="Portainer" \
|
||||
com.docker.extension.additional-urls="[{\"title\":\"Website\",\"url\":\"https://www.portainer.io?utm_campaign=DockerCon&utm_source=DockerDesktop\"},{\"title\":\"Documentation\",\"url\":\"https://docs.portainer.io\"},{\"title\":\"Support\",\"url\":\"https://join.slack.com/t/portainer/shared_invite/zt-txh3ljab-52QHTyjCqbe5RibC2lcjKA\"}]"
|
||||
|
||||
COPY dist/docker /
|
||||
COPY dist/docker-compose /
|
||||
COPY dist/helm /
|
||||
COPY dist/kubectl /
|
||||
COPY dist/mustache-templates /mustache-templates/
|
||||
|
||||
@@ -11,7 +11,6 @@ LABEL org.opencontainers.image.title="Portainer" \
|
||||
com.docker.extension.additional-urls="[{\"title\":\"Website\",\"url\":\"https://www.portainer.io?utm_campaign=DockerCon&utm_source=DockerDesktop\"},{\"title\":\"Documentation\",\"url\":\"https://docs.portainer.io\"},{\"title\":\"Support\",\"url\":\"https://join.slack.com/t/portainer/shared_invite/zt-txh3ljab-52QHTyjCqbe5RibC2lcjKA\"}]"
|
||||
|
||||
COPY dist/docker /
|
||||
COPY dist/docker-compose /
|
||||
COPY dist/helm /
|
||||
COPY dist/kubectl /
|
||||
COPY dist/mustache-templates /mustache-templates/
|
||||
|
||||
@@ -10,7 +10,6 @@ USER ContainerAdministrator
|
||||
|
||||
COPY dist/mingit/ mingit/
|
||||
COPY dist/docker.exe /
|
||||
COPY dist/docker-compose.exe /
|
||||
COPY dist/helm.exe /
|
||||
COPY dist/kubectl.exe /
|
||||
COPY dist/mustache-templates /mustache-templates/
|
||||
|
||||
Reference in New Issue
Block a user