🧹 Make docker compose version obsolete, fix casing (LayerZero-Labs#716)

withbest · Jul 18, 2024 · 4eb19e7 · 4eb19e7
1 parent c05f11c
commit 4eb19e7
Show file tree

Hide file tree

Showing 8 changed files with 9 additions and 8 deletions.
diff --git a/.changeset/eighty-terms-roll.md 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
@@ -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
@@ -7,7 +7,6 @@
 #   .-.-.   .-.-.   .-.-.   .-.-.   .-.-.   .-.-.   .-.-.   .-.-
 #  / / \ \ / / \ \ / / \ \ / / \ \ / / \ \ / / \ \ / / \ \ / / \
 # `-'   `-`-'   `-`-'   `-`-'   `-`-'   `-`-'   `-`-'   `-`-'
-version: "3.9"
 
 services:
   # ~^~^~^~^~^~^~^~^~^~^~^~^~^~^~^~^~^~^~^~^~^~^~^~^~^~^~^~^~^~^~

diff --git 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
@@ -7,7 +7,6 @@
 #   .-.-.   .-.-.   .-.-.   .-.-.   .-.-.   .-.-.   .-.-.   .-.-
 #  / / \ \ / / \ \ / / \ \ / / \ \ / / \ \ / / \ \ / / \ \ / / \
 # `-'   `-`-'   `-`-'   `-`-'   `-`-'   `-`-'   `-`-'   `-`-'
-version: "3.9"
 
 services:
   # Service that contains the whole project

diff --git 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
@@ -71,7 +71,6 @@ export const createSimulationComposeSpec = (
     config: SimulationConfig,
     networks: Record<string, AnvilOptions>
 ): 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
@@ -103,7 +103,7 @@ export type ComposeSpecVolume = null | ComposeSpecVolumeDefinition
 export type ComposeSpecVolumes = Record<string, ComposeSpecVolume>
 
 export interface ComposeSpec {
-    version: ComposeSpecVersion
+    version?: ComposeSpecVersion
     services?: ComposeSpecServices
     volumes?: ComposeSpecVolumes
 }