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.

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

Docker compose updates #9073

Merged
merged 9 commits into from
Nov 26, 2024
Next Next commit
start changes to docker compose page
  • Loading branch information
rosieyohannan committed Nov 4, 2024
commit 86d9d54fd3377ec00ab0dd71430f3a57e53eaae1
2 changes: 1 addition & 1 deletion jekyll/_cci2/building-docker-images.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ NOTE: The _remote_ in "remote Docker" is a legacy term from when remote Docker u
[#introduction]
== Introduction

To build Docker images (for example, using `docker` or `docker-compose` commands) when using the Docker execution environment, you must use the `setup_remote_docker` key in your job:
To build Docker images (for example, using `docker` or `docker compose` commands) when using the Docker execution environment, you must use the `setup_remote_docker` key in your job:

{% include snippets/docker-auth.adoc %}

Expand Down
10 changes: 3 additions & 7 deletions jekyll/_cci2/docker-compose.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,17 +6,13 @@ contentTags:
platform:
- Cloud
- Server v4.x
- Server v3.x
---

This document describes how to install and use Docker Compose, and assumes the reader has some experience using the `docker-compose` utility.
This page describes how to use Docker Compose in your CircleCI pipelines.

If you are new to Docker Compose, do consider reviewing the [official Docker Compose overview](https://docs.docker.com/compose/), or checking out the [Getting Started guide](https://docs.docker.com/compose/gettingstarted/).

* TOC
{:toc}

The `docker compose` utility is [pre-installed in the CircleCI convenience
The utility is [pre-installed in the CircleCI convenience
images]({{ site.baseurl }}/circleci-images/#pre-installed-tools) and machine executor images.

If you are using the Docker executor and **are not** using a convenience image, you can install Docker Compose into your [primary container]({{ site.baseurl }}/glossary/#primary-container) during the job execution with the Remote Docker Environment activated by adding the following to your [`.circleci/config.yml`]({{ site.baseurl }}/configuration-reference/) file:
Expand All @@ -25,7 +21,7 @@ If you are using the Docker executor and **are not** using a convenience image,
- run:
name: Install Docker Compose
environment:
COMPOSE_VERSION: 'v2.25.0'
COMPOSE_VERSION: 'v2.30.1'
command: |
curl -sSL "https://github.com/docker/compose/releases/download/${COMPOSE_VERSION}/docker-compose-$(uname -s)-$(uname -m)" -o ~/docker-compose
mkdir -p ~/.docker/cli-plugins
Expand Down