From 6c9434cffa8c688ad846ec9f571daf70255769f6 Mon Sep 17 00:00:00 2001 From: Christian Schmidt Date: Thu, 14 Sep 2023 18:33:01 +0200 Subject: [PATCH 1/4] Use fixed folder inside container --- .devcontainer/Dockerfile | 4 ++++ .devcontainer/codespaces/devcontainer.json | 2 +- .devcontainer/devcontainer.json | 2 +- .devcontainer/docker-compose.yml | 2 +- 4 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.devcontainer/Dockerfile b/.devcontainer/Dockerfile index b3b1d97a241..c6384be4082 100644 --- a/.devcontainer/Dockerfile +++ b/.devcontainer/Dockerfile @@ -18,3 +18,7 @@ RUN gem install foreman RUN su vscode -c "source /usr/local/share/nvm/nvm.sh && npm install -g yarn" 2>&1 COPY welcome-message.txt /usr/local/etc/vscode-dev-containers/first-run-notice.txt + +WORKDIR /mastodon + +ENV PATH=/mastodon/bin:${PATH} diff --git a/.devcontainer/codespaces/devcontainer.json b/.devcontainer/codespaces/devcontainer.json index ca9156fdaa4..f025e1e1afe 100644 --- a/.devcontainer/codespaces/devcontainer.json +++ b/.devcontainer/codespaces/devcontainer.json @@ -2,7 +2,7 @@ "name": "Mastodon on GitHub Codespaces", "dockerComposeFile": "../docker-compose.yml", "service": "app", - "workspaceFolder": "/workspaces/${localWorkspaceFolderBasename}", + "workspaceFolder": "/mastodon", "features": { "ghcr.io/devcontainers/features/sshd:1": {} diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json index fa8d6542c18..68c2f5fc3f9 100644 --- a/.devcontainer/devcontainer.json +++ b/.devcontainer/devcontainer.json @@ -2,7 +2,7 @@ "name": "Mastodon on local machine", "dockerComposeFile": "docker-compose.yml", "service": "app", - "workspaceFolder": "/workspaces/${localWorkspaceFolderBasename}", + "workspaceFolder": "/mastodon", "features": { "ghcr.io/devcontainers/features/sshd:1": {} diff --git a/.devcontainer/docker-compose.yml b/.devcontainer/docker-compose.yml index 20aecd71d68..673331286d0 100644 --- a/.devcontainer/docker-compose.yml +++ b/.devcontainer/docker-compose.yml @@ -6,7 +6,7 @@ services: context: . dockerfile: Dockerfile volumes: - - ../..:/workspaces:cached + - ..:/mastodon:cached environment: RAILS_ENV: development NODE_ENV: development From 674cdb1873392fa586b4b9d0aa5e4540ece6147c Mon Sep 17 00:00:00 2001 From: Christian Schmidt Date: Thu, 14 Sep 2023 20:50:56 +0200 Subject: [PATCH 2/4] Add safe.directory in Dockerfile --- .devcontainer/Dockerfile | 2 ++ .devcontainer/codespaces/devcontainer.json | 1 - .devcontainer/devcontainer.json | 1 - 3 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.devcontainer/Dockerfile b/.devcontainer/Dockerfile index c6384be4082..7cd817aaefa 100644 --- a/.devcontainer/Dockerfile +++ b/.devcontainer/Dockerfile @@ -22,3 +22,5 @@ COPY welcome-message.txt /usr/local/etc/vscode-dev-containers/first-run-notice.t WORKDIR /mastodon ENV PATH=/mastodon/bin:${PATH} + +RUN su vscode -c "git config --global --add safe.directory /mastodon" diff --git a/.devcontainer/codespaces/devcontainer.json b/.devcontainer/codespaces/devcontainer.json index f025e1e1afe..ee25ab269e5 100644 --- a/.devcontainer/codespaces/devcontainer.json +++ b/.devcontainer/codespaces/devcontainer.json @@ -36,7 +36,6 @@ "LIBRE_TRANSLATE_ENDPOINT": "" }, - "onCreateCommand": "git config --global --add safe.directory ${containerWorkspaceFolder}", "postCreateCommand": ".devcontainer/post-create.sh", "waitFor": "postCreateCommand", diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json index 68c2f5fc3f9..69d686d1b40 100644 --- a/.devcontainer/devcontainer.json +++ b/.devcontainer/devcontainer.json @@ -27,7 +27,6 @@ "onAutoForward": "silent" }, - "onCreateCommand": "git config --global --add safe.directory ${containerWorkspaceFolder}", "postCreateCommand": ".devcontainer/post-create.sh", "waitFor": "postCreateCommand", From d06c6df85c73b0da0df0ca601a506d1b16d9330a Mon Sep 17 00:00:00 2001 From: Christian Schmidt Date: Sat, 6 Jan 2024 16:31:58 +0100 Subject: [PATCH 3/4] Remove irrelevant comments --- .devcontainer/Dockerfile | 6 ------ .devcontainer/post-create.sh | 3 ++- 2 files changed, 2 insertions(+), 7 deletions(-) diff --git a/.devcontainer/Dockerfile b/.devcontainer/Dockerfile index 7aaefe0c12e..820e25eb0d2 100644 --- a/.devcontainer/Dockerfile +++ b/.devcontainer/Dockerfile @@ -1,20 +1,14 @@ # For details, see https://github.com/devcontainers/images/tree/main/src/ruby FROM mcr.microsoft.com/devcontainers/ruby:1-3.2-bullseye -# Install Rails -# RUN gem install rails webdrivers - ARG NODE_VERSION="20" RUN su vscode -c "source /usr/local/share/nvm/nvm.sh && nvm install ${NODE_VERSION} 2>&1" -# [Optional] Uncomment this section to install additional OS packages. RUN apt-get update && export DEBIAN_FRONTEND=noninteractive \ && apt-get -y install --no-install-recommends libicu-dev libidn11-dev ffmpeg imagemagick libpam-dev -# [Optional] Uncomment this line to install additional gems. RUN gem install foreman -# [Optional] Uncomment this line to install global node packages. RUN su vscode -c "source /usr/local/share/nvm/nvm.sh && corepack enable" 2>&1 COPY welcome-message.txt /usr/local/etc/vscode-dev-containers/first-run-notice.txt diff --git a/.devcontainer/post-create.sh b/.devcontainer/post-create.sh index 82a2ccbb6ce..1c3955d56f2 100755 --- a/.devcontainer/post-create.sh +++ b/.devcontainer/post-create.sh @@ -1,6 +1,7 @@ #!/bin/bash -set -e # Fail the whole script on first error +# Fail the whole script on first error +set -ev # Fetch Ruby gem dependencies bundle config path 'vendor/bundle' From 0ae3518a0b0ed6ae3cf4bf18d50b58c9827d4b36 Mon Sep 17 00:00:00 2001 From: Christian Schmidt Date: Sat, 3 Feb 2024 13:31:40 +0100 Subject: [PATCH 4/4] Append instead of prepend --- .devcontainer/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.devcontainer/Dockerfile b/.devcontainer/Dockerfile index 820e25eb0d2..cad4c9b0be8 100644 --- a/.devcontainer/Dockerfile +++ b/.devcontainer/Dockerfile @@ -15,6 +15,6 @@ COPY welcome-message.txt /usr/local/etc/vscode-dev-containers/first-run-notice.t WORKDIR /mastodon -ENV PATH=/mastodon/bin:${PATH} +ENV PATH=${PATH}:/mastodon/bin RUN su vscode -c "git config --global --add safe.directory /mastodon"