From 4eb19e77a375eb4597eaffec9b3cad06b65c5db5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A1n=20Jakub=20Nani=C5=A1ta?= Date: Thu, 18 Jul 2024 12:53:34 -0700 Subject: [PATCH] =?UTF-8?q?=F0=9F=A7=B9=20Make=20docker=20compose=20versio?= =?UTF-8?q?n=20obsolete,=20fix=20casing=20(#716)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .changeset/eighty-terms-roll.md | 6 ++++++ Dockerfile | 4 ++-- docker-compose.local.yaml | 1 - docker-compose.registry.yaml | 1 - docker-compose.templates.yaml | 1 - docker-compose.yaml | 1 - packages/devtools-evm-hardhat/src/simulation/compose.ts | 1 - packages/devtools/src/docker/types.ts | 2 +- 8 files changed, 9 insertions(+), 8 deletions(-) create mode 100644 .changeset/eighty-terms-roll.md diff --git a/.changeset/eighty-terms-roll.md b/.changeset/eighty-terms-roll.md new file mode 100644 index 000000000..243ad97aa --- /dev/null +++ b/.changeset/eighty-terms-roll.md @@ -0,0 +1,6 @@ +--- +"@layerzerolabs/devtools-evm-hardhat": patch +"@layerzerolabs/devtools": patch +--- + +Make docker compose schema optional diff --git a/Dockerfile b/Dockerfile index 13a30e905..fcbb6dcf5 100644 --- a/Dockerfile +++ b/Dockerfile @@ -41,7 +41,7 @@ ARG EVM_NODE_IMAGE=node-evm-hardhat # .-.-. .-.-. .-.-. .-.-. .-.-. .-.-. .-.-. .-.- # / / \ \ / / \ \ / / \ \ / / \ \ / / \ \ / / \ \ / / \ \ / / \ # `-' `-`-' `-`-' `-`-' `-`-' `-`-' `-`-' `-`-' -FROM node:$NODE_VERSION as base +FROM node:$NODE_VERSION AS base ARG RUST_TOOLCHAIN_VERSION=1.75.0 @@ -104,7 +104,7 @@ RUN docker compose version # .-.-. .-.-. .-.-. .-.-. .-.-. .-.-. .-.-. .-.- # / / \ \ / / \ \ / / \ \ / / \ \ / / \ \ / / \ \ / / \ \ / / \ # `-' `-`-' `-`-' `-`-' `-`-' `-`-' `-`-' `-`-' -FROM $BASE_IMAGE as development +FROM $BASE_IMAGE AS development ENV NPM_CONFIG_STORE_DIR=/pnpm ENV NPM_CONFIG_PACKAGE_IMPORT_METHOD=copy diff --git a/docker-compose.local.yaml b/docker-compose.local.yaml index 6c4de8c0f..7b893f10a 100644 --- a/docker-compose.local.yaml +++ b/docker-compose.local.yaml @@ -7,7 +7,6 @@ # .-.-. .-.-. .-.-. .-.-. .-.-. .-.-. .-.-. .-.- # / / \ \ / / \ \ / / \ \ / / \ \ / / \ \ / / \ \ / / \ \ / / \ # `-' `-`-' `-`-' `-`-' `-`-' `-`-' `-`-' `-`-' -version: "3.9" services: # ~^~^~^~^~^~^~^~^~^~^~^~^~^~^~^~^~^~^~^~^~^~^~^~^~^~^~^~^~^~^~ diff --git a/docker-compose.registry.yaml b/docker-compose.registry.yaml index 53067d212..420917044 100644 --- a/docker-compose.registry.yaml +++ b/docker-compose.registry.yaml @@ -7,7 +7,6 @@ # .-.-. .-.-. .-.-. .-.-. .-.-. .-.-. .-.-. .-.- # / / \ \ / / \ \ / / \ \ / / \ \ / / \ \ / / \ \ / / \ \ / / \ # `-' `-`-' `-`-' `-`-' `-`-' `-`-' `-`-' `-`-' -version: "3.9" services: # ~^~^~^~^~^~^~^~^~^~^~^~^~^~^~^~^~^~^~^~^~^~^~^~^~^~^~^~^~^~^~ diff --git a/docker-compose.templates.yaml b/docker-compose.templates.yaml index 2880d2a61..d643a3bbe 100644 --- a/docker-compose.templates.yaml +++ b/docker-compose.templates.yaml @@ -7,7 +7,6 @@ # .-.-. .-.-. .-.-. .-.-. .-.-. .-.-. .-.-. .-.- # / / \ \ / / \ \ / / \ \ / / \ \ / / \ \ / / \ \ / / \ \ / / \ # `-' `-`-' `-`-' `-`-' `-`-' `-`-' `-`-' `-`-' -version: "3.9" services: # Service that contains the whole project diff --git a/docker-compose.yaml b/docker-compose.yaml index 25ccd079e..437294044 100644 --- a/docker-compose.yaml +++ b/docker-compose.yaml @@ -7,7 +7,6 @@ # .-.-. .-.-. .-.-. .-.-. .-.-. .-.-. .-.-. .-.- # / / \ \ / / \ \ / / \ \ / / \ \ / / \ \ / / \ \ / / \ \ / / \ # `-' `-`-' `-`-' `-`-' `-`-' `-`-' `-`-' `-`-' -version: "3.9" services: # ~^~^~^~^~^~^~^~^~^~^~^~^~^~^~^~^~^~^~^~^~^~^~^~^~^~^~^~^~^~^~ diff --git a/packages/devtools-evm-hardhat/src/simulation/compose.ts b/packages/devtools-evm-hardhat/src/simulation/compose.ts index 55620a77b..5a59ae2b3 100644 --- a/packages/devtools-evm-hardhat/src/simulation/compose.ts +++ b/packages/devtools-evm-hardhat/src/simulation/compose.ts @@ -71,7 +71,6 @@ export const createSimulationComposeSpec = ( config: SimulationConfig, networks: Record ): ComposeSpec => ({ - version: '3.9', services: pipe( networks, // First we turn the networks into docker compose specs for EVM nodes diff --git a/packages/devtools/src/docker/types.ts b/packages/devtools/src/docker/types.ts index ad4f0a676..905a45ba2 100644 --- a/packages/devtools/src/docker/types.ts +++ b/packages/devtools/src/docker/types.ts @@ -103,7 +103,7 @@ export type ComposeSpecVolume = null | ComposeSpecVolumeDefinition export type ComposeSpecVolumes = Record export interface ComposeSpec { - version: ComposeSpecVersion + version?: ComposeSpecVersion services?: ComposeSpecServices volumes?: ComposeSpecVolumes }