Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Upgrade to docker compose@v2 #32

Merged
merged 3 commits into from
Apr 21, 2023
Merged

Upgrade to docker compose@v2 #32

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
59a0d44
Upgrade to docker compose v2
caffeinatedpixel Apr 19, 2023
bdf3416
Misc fixes
caffeinatedpixel Apr 20, 2023
fccab52
Quiet grep
caffeinatedpixel Apr 21, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
32 changes: 27 additions & 5 deletions docker/check_docker-compose.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,25 +5,47 @@
# 3 not installed
# 4 older than required minimum version
# 5 newer than required maximum version
# 6 conflicting installs, both compose @v1 and @v2 are installed

# verify that docker-compose is executable
if [ ! -x "$(command -v docker-compose)" ]; then
exit 3
fi

MIN_VERSION_MAJOR=1
MIN_VERSION_MINOR=16
MAX_VERSION_MAJOR=1
MAX_VERSION_MINOR=29
# verify that the alias works if it exists (will succeed for v1 installs)
if ! docker-compose version > /dev/null 2>&1 ; then
exit 3
fi

# verify that docker compose (v2) is callable
if ! docker compose version > /dev/null 2>&1 ; then
exit 4
fi

# verify that docker compose & docker-compose aren't both installed
if docker-compose version | grep -q '^docker-compose .* [0-9][0-9]*\.[0-9][0-9]*\.[0-9][0-9]*' ; then
exit 6
fi

MIN_VERSION_MAJOR=2
MIN_VERSION_MINOR=0
MAX_VERSION_MAJOR=2
MAX_VERSION_MINOR=17

pushd "$(dirname "${BASH_SOURCE[0]}")" > /dev/null
source ../acmlib.sh
popd > /dev/null
require_executable_tmp_dir # docker-compose requires TMPDIR to be mounted without noexec

VERSION="$(docker-compose -v | sed 's/^.* \([0-9][0-9]*\)\.\([0-9][0-9]*\)\.\([0-9][0-9]*\).*$/\1 \2 \3/')"
VERSION="$(docker compose version | sed 's/^.* v\?\([0-9][0-9]*\)\.\([0-9][0-9]*\)\.\([0-9][0-9]*\).*$/\1 \2 \3/')"
VERSION_MAJOR="$(echo $VERSION | cut -d' ' -f1)"
VERSION_MINOR="$(echo $VERSION | cut -d' ' -f2)"

# check if major version is an integer
if [[ ! "$VERSION_MAJOR" =~ ^[0-9]+$ ]]; then
exit 4
fi

if [ "$VERSION_MAJOR" -lt "$MIN_VERSION_MAJOR" ] ||
[ "$VERSION_MAJOR" -eq "$MIN_VERSION_MAJOR" -a "$VERSION_MINOR" -lt "$MIN_VERSION_MINOR" ]; then
exit 4
Expand Down
10 changes: 7 additions & 3 deletions docker/check_docker.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,17 +11,21 @@ if [ ! -x "$(command -v docker)" ]; then
exit 3
fi

MIN_VERSION_MAJOR=17
MIN_VERSION_MINOR=05
MIN_VERSION_PATCH=13 # Require min version that contains the docker-compose-plugin https://docs.docker.com/engine/release-notes/20.10/#201013
MIN_VERSION_MAJOR=20
MIN_VERSION_MINOR=10
MAX_VERSION_MAJOR=19
MAX_VERSION_MINOR=03

VERSION="$(docker -v | sed 's/^.* \([0-9][0-9]*\)\.\([0-9][0-9]*\)\.\([0-9][0-9]*\).*$/\1 \2 \3/')"
VERSION_MAJOR="$(echo $VERSION | cut -d' ' -f1)"
VERSION_MINOR="$(echo $VERSION | cut -d' ' -f2)"
VERSION_PATCH="$(echo $VERSION | cut -d' ' -f3)"


if [ "$VERSION_MAJOR" -lt "$MIN_VERSION_MAJOR" ] ||
[ "$VERSION_MAJOR" -eq "$MIN_VERSION_MAJOR" -a "$VERSION_MINOR" -lt "$MIN_VERSION_MINOR" ]; then
[ "$VERSION_MAJOR" -eq "$MIN_VERSION_MAJOR" -a "$VERSION_MINOR" -lt "$MIN_VERSION_MINOR" ] ||
[ "$VERSION_MAJOR" -eq "$MIN_VERSION_MAJOR" -a "$VERSION_MINOR" -eq "$MIN_VERSION_MINOR" -a "$VERSION_PATCH" -lt "$MIN_VERSION_PATCH" ]; then
exit 4
# Disabled in https://github.com/activecm/shell-lib/pull/9
# elif [ "$VERSION_MAJOR" -gt "$MAX_VERSION_MAJOR" ] ||
Expand Down
82 changes: 44 additions & 38 deletions docker/install_docker.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,7 @@ elif [ -s /etc/redhat-release ] && grep -iq 'release 7\|release 8' /etc/redhat-r
fi
fi

$SUDO yum -y -q -e 0 install yum-utils device-mapper-persistent-data lvm2 shadow-utils python3-pip
$SUDO yum -y -q -e 0 install yum-utils device-mapper-persistent-data lvm2 shadow-utils

$SUDO yum-config-manager -q --enable extras >/dev/null

Expand All @@ -111,8 +111,7 @@ elif [ -s /etc/lsb-release ] && grep -iq '^DISTRIB_ID *= *Ubuntu' /etc/lsb-relea
apt-transport-https \
ca-certificates \
curl \
software-properties-common \
python3-pip
software-properties-common

curl -fsSL https://download.docker.com/linux/ubuntu/gpg | $SUDO apt-key add -

Expand Down Expand Up @@ -156,45 +155,52 @@ if [ "$DOCKER_COMPOSE_CHECK" -eq 0 ]; then
echo "Docker-Compose appears to already be installed. Skipping."
else
### Install Docker-Compose ###
# https://docs.docker.com/compose/install/#install-compose
DOCKER_COMPOSE_VERSION="1.29.2"

echo "Installing Docker-Compose v${DOCKER_COMPOSE_VERSION}..."

# Check if the latest version of pip is supported by the version of python installed
# In particular, Ubuntu 16's version of python (v3.5) does not support the latest verison of pip
MIN_PYTHON_VERSION_MAJOR=3
MIN_PYTHON_VERSION_MINOR=6
PYTHON_VERSION_TEST="
import sys
if (sys.version_info.major > $MIN_PYTHON_VERSION_MAJOR or
(sys.version_info.major == $MIN_PYTHON_VERSION_MAJOR and sys.version_info.minor >= $MIN_PYTHON_VERSION_MINOR)):
sys.exit(0)
sys.exit(1)
"
if python3 -c "$PYTHON_VERSION_TEST"; then
# prefer to install with pip3 if possible since github doesn't have aarch64 binary releases for docker-compose
# https://docs.docker.com/compose/install/linux/

echo "Installing Docker Compose..."

# Uninstall docker-compose@v1 installed via pip
PIP3_CMD="python3 -m pip"
if [ -n "$SUDO" ]; then
PIP3_CMD="$SUDO -H $PIP3_CMD"
fi

# pip3 recommends -H when running with sudo to prevent creating root owned files in the user's home dir
PIP3_CMD="python3 -m pip"
if [ -n "$SUDO" ]; then
PIP3_CMD="$SUDO -H $PIP3_CMD"
# Check if pip is callable
if "$PIP3_CMD" --version > /dev/null 2>&1 ; then
# Check if docker-compose is installed via pip
if [ "$PIP3_CMD" list | grep -s "docker-compose" ]; then
# Attempt to uninstall docker-compose
if [ "$PIP3_CMD" uninstall docker-compose ]; then
echo "Uninstalled docker-compose@v1"
fi
fi
$PIP3_CMD install --upgrade pip
$PIP3_CMD install --no-warn-script-location docker-compose==${DOCKER_COMPOSE_VERSION}
elif [ "$(uname -m)" = "x86_64" ]; then
# if we are on x86, download docker-compose from Github
$SUDO_E curl --silent -L https://github.com/docker/compose/releases/download/${DOCKER_COMPOSE_VERSION}/docker-compose-`uname -s`-`uname -m` -o /usr/local/bin/docker-compose
$SUDO chmod +x /usr/local/bin/docker-compose
else
fail 'docker-compose could not be automatically installed on this system. Please install it manually and re-run the script.'
fi

# Some OS don't insert /usr/local/bin into the PATH when running SUDO (CentOS)
# Provide a symlink in /usr/bin in order to get around this issue.
# Update package lists again because docker adds the docker-compose-plugin repo
# Install docker-compose-plugin
if [ -s /etc/redhat-release ] && grep -iq 'release 7\|release 8' /etc/redhat-release ; then
$SUDO yum -y -q update
$SUDO yum -y -q -e 0 install docker-compose-plugin
elif [ -s /etc/lsb-release ] && grep -iq '^DISTRIB_ID *= *Ubuntu' /etc/lsb-release ; then
$SUDO apt-get -qq update > /dev/null 2>&1
$SUDO apt-get -qq install docker-compose-plugin
fi

# Create alias for docker-compose to call docker compose
echo 'docker compose "$@"' | $SUDO tee /usr/local/bin/docker-compose > /dev/null
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I believe this will take care of overwriting/ uninstalling the native installations created on line 187 of the previous version.


$SUDO chmod +x /usr/local/bin/docker-compose

#Some OS don't insert /usr/local/bin into the PATH when running SUDO (CentOS)
#Provide a symlink in /usr/bin in order to get around this issue.
if [ ! -e /usr/bin/docker-compose ]; then
$SUDO ln -s /usr/local/bin/docker-compose /usr/bin/docker-compose
fi

$SUDO mkdir -p "$HOME"/.docker
$SUDO chown "$USER":"$USER" "$HOME"/.docker -R
$SUDO chmod g+rwx "$HOME"/.docker -R

fi

if [ "${ADD_DOCKER_GROUP}" = "true" ]; then
Expand All @@ -204,17 +210,17 @@ if [ "${ADD_DOCKER_GROUP}" = "true" ]; then
$SUDO usermod -aG docker $USER

if [ "${REPLACE_SHELL}" = "true" ]; then
echo "Docker installation complete. You should have access to the 'docker' and 'docker-compose' commands immediately."
echo "Docker installation complete. You should have access to the 'docker' and 'docker compose' commands immediately."
# Hack to activate the docker group on the current user without logging out.
# Downside is it completely replaces the shell and prevents calling scripts from continuing.
# https://superuser.com/a/853897
exec sg docker newgrp `id -gn`
fi

echo "You will need to login again for these changes to take effect."
echo "Docker installation complete. You should have access to the 'docker' and 'docker-compose' commands once you log out and back in."
echo "Docker installation complete. You should have access to the 'docker' and 'docker compose' commands once you log out and back in."
else
echo "Docker installation complete. 'docker' and 'docker-compose' must be run using sudo or the root account unless you have added your user to the 'docker' group."
echo "Docker installation complete. 'docker' and 'docker compose' must be run using sudo or the root account unless you have added your user to the 'docker' group."
fi

# Change back to original directory
Expand Down