Skip to content

Commit

Permalink
Revert "Use new Docker Compose installation method (#178)" to old method
Browse files Browse the repository at this point in the history 
This reverts commit 2b2cc95.
  • Loading branch information
@FelicianoTech
FelicianoTech committed Aug 24, 2022
1 parent 773e38e commit 07f9915
Show file tree
Hide file tree
Showing 4 changed files with 20 additions and 28 deletions.
12 changes: 5 additions & 7 deletions 18.04/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -108,14 +108,12 @@ RUN apt-get update && apt-get install -y \
rm -rf /var/lib/apt/lists/*

# Install Docker Compose - see prerequisite above
# Even though they use the same repo, Docker Compose is installed seperately
# from Docker Engine due to the fact that Docker Compose releases much more
# frequently. This is a caching decision.
ENV COMPOSE_VER 2.6.0
ENV COMPOSE_VERSION 2.4.1
ENV COMPOSE_SWITCH_VERSION 1.0.4
RUN apt-get update && apt-get install --yes --no-install-recommends \
docker-compose-plugin=${COMPOSE_VER}~ubuntu-$( lsb_release -cs ) \
&& \
RUN dockerPluginDir=/usr/local/lib/docker/cli-plugins && \
mkdir -p $dockerPluginDir && \
curl -sSL "https://github.com/docker/compose/releases/download/v${COMPOSE_VERSION}/docker-compose-linux-$(uname -m)" -o $dockerPluginDir/docker-compose && \
chmod +x $dockerPluginDir/docker-compose && \
curl -fL https://github.com/docker/compose-switch/releases/download/v${COMPOSE_SWITCH_VERSION}/docker-compose-linux-amd64 -o /usr/local/bin/compose-switch && \
# Quick test of the Docker Compose install
docker compose version && \
Expand Down
12 changes: 5 additions & 7 deletions 20.04/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -108,14 +108,12 @@ RUN apt-get update && apt-get install -y \
rm -rf /var/lib/apt/lists/*

# Install Docker Compose - see prerequisite above
# Even though they use the same repo, Docker Compose is installed seperately
# from Docker Engine due to the fact that Docker Compose releases much more
# frequently. This is a caching decision.
ENV COMPOSE_VER 2.6.0
ENV COMPOSE_VERSION 2.4.1
ENV COMPOSE_SWITCH_VERSION 1.0.4
RUN apt-get update && apt-get install --yes --no-install-recommends \
docker-compose-plugin=${COMPOSE_VER}~ubuntu-$( lsb_release -cs ) \
&& \
RUN dockerPluginDir=/usr/local/lib/docker/cli-plugins && \
mkdir -p $dockerPluginDir && \
curl -sSL "https://github.com/docker/compose/releases/download/v${COMPOSE_VERSION}/docker-compose-linux-$(uname -m)" -o $dockerPluginDir/docker-compose && \
chmod +x $dockerPluginDir/docker-compose && \
curl -fL https://github.com/docker/compose-switch/releases/download/v${COMPOSE_SWITCH_VERSION}/docker-compose-linux-amd64 -o /usr/local/bin/compose-switch && \
# Quick test of the Docker Compose install
docker compose version && \
Expand Down
12 changes: 5 additions & 7 deletions 22.04/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -108,14 +108,12 @@ RUN apt-get update && apt-get install -y \
rm -rf /var/lib/apt/lists/*

# Install Docker Compose - see prerequisite above
# Even though they use the same repo, Docker Compose is installed seperately
# from Docker Engine due to the fact that Docker Compose releases much more
# frequently. This is a caching decision.
ENV COMPOSE_VER 2.6.0
ENV COMPOSE_VERSION 2.4.1
ENV COMPOSE_SWITCH_VERSION 1.0.4
RUN apt-get update && apt-get install --yes --no-install-recommends \
docker-compose-plugin=${COMPOSE_VER}~ubuntu-$( lsb_release -cs ) \
&& \
RUN dockerPluginDir=/usr/local/lib/docker/cli-plugins && \
mkdir -p $dockerPluginDir && \
curl -sSL "https://github.com/docker/compose/releases/download/v${COMPOSE_VERSION}/docker-compose-linux-$(uname -m)" -o $dockerPluginDir/docker-compose && \
chmod +x $dockerPluginDir/docker-compose && \
curl -fL https://github.com/docker/compose-switch/releases/download/v${COMPOSE_SWITCH_VERSION}/docker-compose-linux-amd64 -o /usr/local/bin/compose-switch && \
# Quick test of the Docker Compose install
docker compose version && \
Expand Down
12 changes: 5 additions & 7 deletions Dockerfile.template
View file
Original file line number Diff line number Diff line change
Expand Up @@ -108,14 +108,12 @@ RUN apt-get update && apt-get install -y \
rm -rf /var/lib/apt/lists/*

# Install Docker Compose - see prerequisite above
# Even though they use the same repo, Docker Compose is installed seperately
# from Docker Engine due to the fact that Docker Compose releases much more
# frequently. This is a caching decision.
ENV COMPOSE_VER 2.6.0
ENV COMPOSE_VERSION 2.4.1
ENV COMPOSE_SWITCH_VERSION 1.0.4
RUN apt-get update && apt-get install --yes --no-install-recommends \
docker-compose-plugin=${COMPOSE_VER}~ubuntu-$( lsb_release -cs ) \
&& \
RUN dockerPluginDir=/usr/local/lib/docker/cli-plugins && \
mkdir -p $dockerPluginDir && \
curl -sSL "https://github.com/docker/compose/releases/download/v${COMPOSE_VERSION}/docker-compose-linux-$(uname -m)" -o $dockerPluginDir/docker-compose && \
chmod +x $dockerPluginDir/docker-compose && \
curl -fL https://github.com/docker/compose-switch/releases/download/v${COMPOSE_SWITCH_VERSION}/docker-compose-linux-amd64 -o /usr/local/bin/compose-switch && \
# Quick test of the Docker Compose install
docker compose version && \
Expand Down

0 comments on commit 07f9915

Please sign in to comment.