Separate docker-compose.yml

Author: kraftbj

projects/js-packages/jetpack-cli/bin/jp.js

@@ -277,14 +277,17 @@ const main = async () => {
 				envVars.HOST_CWD = monorepoRoot;
 
 				// Build the list of compose files to use
-				const composeFiles = [
-					'-f',
-					resolve( monorepoRoot, 'tools/docker/docker-compose.yml' ),
-					'-f',
-					resolve( monorepoRoot, 'tools/docker/compose-mappings.built.yml' ),
-					'-f',
-					resolve( monorepoRoot, 'tools/docker/compose-extras.built.yml' ),
-				];
+				const composeFiles =
+					args[ 0 ] === 'docker' && [ 'build-image', 'install' ].includes( args[ 1 ] )
+						? [ '-f', resolve( monorepoRoot, 'tools/docker/docker-compose-monorepo.yml' ) ]
+						: [
+								'-f',
+								resolve( monorepoRoot, 'tools/docker/docker-compose.yml' ),
+								'-f',
+								resolve( monorepoRoot, 'tools/docker/compose-mappings.built.yml' ),
+								'-f',
+								resolve( monorepoRoot, 'tools/docker/compose-extras.built.yml' ),
+						  ];
 
 				// Add dev profile for monorepo service
 				const composeArgs = [ 'compose', '--profile', 'dev', ...composeFiles, ...args.slice( 1 ) ];

tools/docker/Dockerfile.monorepo

@@ -69,5 +69,20 @@ WORKDIR /workspace
 COPY bin/monorepo-entrypoint.sh /usr/local/bin/
 RUN chmod +x /usr/local/bin/monorepo-entrypoint.sh
 
+# Set up locale properly
+RUN apt-get update && apt-get install -y locales \
+    && locale-gen en_US.UTF-8 \
+    && update-locale LANG=en_US.UTF-8 LC_ALL=en_US.UTF-8
+
+ENV LANG=en_US.UTF-8
+ENV LC_ALL=en_US.UTF-8
+
+# Set up PNPM global directory
+ENV PNPM_HOME=/usr/local/pnpm
+ENV PATH="${PNPM_HOME}:${PATH}"
+
+RUN mkdir -p "$PNPM_HOME" \
+    && chmod 777 "$PNPM_HOME"
+
 ENTRYPOINT ["/usr/local/bin/monorepo-entrypoint.sh"]
 CMD ["bash"]

tools/docker/docker-compose.yml

@@ -49,18 +49,3 @@ services:
     environment:
       - HOST_PORT=${PORT_WORDPRESS:-80}
       - COMPOSE_PROJECT_NAME=$COMPOSE_PROJECT_NAME
-
-  monorepo:
-    profiles:
-      - dev
-    build:
-      context: ${HOST_CWD:-.}/tools/docker
-      dockerfile: Dockerfile.monorepo
-      args:
-        PHP_VERSION: ${PHP_VERSION}
-        COMPOSER_VERSION: ${COMPOSER_VERSION}
-        NODE_VERSION: ${NODE_VERSION}
-        PNPM_VERSION: ${PNPM_VERSION}
-    volumes:
-      - ${HOST_CWD:-.}:/usr/local/src/jetpack-monorepo
-    working_dir: /usr/local/src/jetpack-monorepo