Skip to content

Commit ab5f6f5

Browse files
Chore: Cleanup nvm
1 parent a0b234a commit ab5f6f5

File tree

2 files changed

+5
-3
lines changed

2 files changed

+5
-3
lines changed

.github/.devcontainer/Dockerfile

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
ARG VARIANT=8
22
ARG USERNAME=vscode
33
ARG DELTA_VERSION=0.18.2
4-
ARG NODE_VERSION="lts/*"
5-
ARG NODE_MODULES="typescript aws-cdk prettier cdk-dia prettier aws-cdk joplin"
4+
ARG NODE_VERSION_LTS="lts/*"
5+
ARG NODE_MODULES="typescript prettier prettier aws-cdk"
66

77
FROM mcr.microsoft.com/vscode/devcontainers/php:${VARIANT}
88
ENV RAILS_DEVELOPMENT_HOSTS=".githubpreview.dev"
@@ -58,7 +58,7 @@ RUN sudo wget -O phive.phar "https://phar.io/releases/phive.phar" \
5858

5959
# [Choice] Node.js version: none, lts/*, 16, 14, 12, 1
6060
LABEL build.step.node=install_node
61-
RUN if [ "${NODE_VERSION}" != "none" ]; then su vscode -c "umask 0002 && . /usr/local/share/nvm/nvm.sh && nvm install ${NODE_VERSION} 2>&1"; fi
61+
RUN su vscode -c "source /usr/local/share/nvm/nvm.sh && nvm install ${NODE_VERSION_LTS}" 2>&1
6262
RUN su vscode -c "source /usr/local/share/nvm/nvm.sh && npm install -g ${NODE_MODULES}" 2>&1
6363

6464
LABEL build.step.sam=install_sam

docker-compose.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@ services:
2828
- WP_DEBUG=${WP_DEBUG_CONFIG}
2929
- SSH_SIGNING_KEY=${SSH_SIGNING_KEY}
3030
wordpressdb:
31+
platform: linux/arm64
3132
image: mariadb
3233
restart: unless-stopped
3334
volumes:
@@ -39,6 +40,7 @@ services:
3940
MARIADB_PASSWORD: ${MYSQL_PASSWORD}
4041
MARIADB_DATABASE: ${MYSQL_DATABASE}
4142
adminer:
43+
platform: linux/arm64
4244
image: adminer
4345
ports:
4446
- 9090:9090

0 commit comments

Comments
 (0)