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

Allow moby-compose and docker-compose-plugin versions to be specified in devcontainer.json for Docker in Docker #841

Open
wants to merge 5 commits into
base: main
Choose a base branch
from
+61 −59
Open

Allow moby-compose and docker-compose-plugin versions to be specified in devcontainer.json for Docker in Docker #841

Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
ec42eaa
Allow moby-compose and docker-compose-plugin versions to be specified…
sayhiben Feb 10, 2024
48fcb4e
Fix syntax error
sayhiben Feb 10, 2024
4aafb7f
Fix misplaced code
sayhiben Feb 10, 2024
f82499e
Update src/docker-in-docker/install.sh
sayhiben Feb 13, 2024
a66f6e3
Merge branch 'main' into refactor-dind-version-suffix-discovery
sayhiben Feb 13, 2024
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
Prev Previous commit
Next Next commit
Loading
Loading status checks…
Update src/docker-in-docker/install.sh 
Co-authored-by: Samruddhi Khandale <[email protected]>
@sayhiben @samruddhikhandale
sayhiben and samruddhikhandale authored Feb 13, 2024

Verified

This commit was signed with the committer’s verified signature.
meowsbits
GPG key ID: 5786AEA5C8D5A520
Verified
Learn about vigilant mode
commit f82499eee7237dc97375c864df06cb84725857dd
2 changes: 1 addition & 1 deletion src/docker-in-docker/install.sh
View file
Original file line number Diff line number Diff line change
@@ -236,7 +236,7 @@ else
set -e

# Install optional package, compose
compose_version_suffix=$(get_package_verson_suffix "${compose_package_name}" "${COMPOSE_PACKAGE_VERSION}")
compose_version_suffix=$(get_package_version_suffix "${compose_package_name}" "${COMPOSE_PACKAGE_VERSION}")
apt-get -y install --no-install-recommends ${compose_package_name}${compose_version_suffix} || err "Package ${compose_package_name}${compose_version_suffix} (Docker Compose v2) not available for OS ${ID} ${VERSION_CODENAME} (${architecture}). Skipping."
fi