diff --git a/.devcontainer/Dockerfile b/.devcontainer/Dockerfile new file mode 100644 index 000000000..e78ea55ed --- /dev/null +++ b/.devcontainer/Dockerfile @@ -0,0 +1,8 @@ +FROM ruby:2 +LABEL maintainer "@tdtds " + +RUN apt update && apt install -y apt-utils libidn11-dev sqlite3 libsqlite3-dev +RUN mkdir -p /workspace +WORKDIR /workspace +EXPOSE 9292 +CMD "/workspace/.devcontainer/run-app.sh" diff --git a/misc/docker-devel/README.md b/.devcontainer/README.md similarity index 68% rename from misc/docker-devel/README.md rename to .devcontainer/README.md index 4bb18703d..56b8435a9 100644 --- a/misc/docker-devel/README.md +++ b/.devcontainer/README.md @@ -3,13 +3,13 @@ ## how to build ``` -% docker build -t tdiary-devel misc/docker-devel +% docker build -t tdiary-devel .devcontainer ``` ## how to run ``` -% docker run -v $(pwd):/usr/src/app -p 9292:9292 -it --rm tdiary-devel +% docker run -v $(pwd):/workspace -p 9292:9292 -it --rm tdiary-devel ``` or debugging `contrib` in the parent directory: diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json new file mode 100644 index 000000000..0ca1b49f8 --- /dev/null +++ b/.devcontainer/devcontainer.json @@ -0,0 +1,34 @@ +// For format details, see https://aka.ms/vscode-remote/devcontainer.json or this file's README at: +// https://github.com/microsoft/vscode-dev-containers/tree/v0.122.1/containers/docker-existing-dockerfile +{ + "name": "Existing Dockerfile", + + // Sets the run context to one level up instead of the .devcontainer folder. + "context": "..", + + // Update the 'dockerFile' property if you aren't using the standard 'Dockerfile' filename. + "dockerFile": "Dockerfile", + + // Set *default* container specific settings.json values on container create. + "settings": { + "terminal.integrated.shell.linux": null + }, + + // Add the IDs of extensions you want installed when the container is created. + "extensions": [] + + // Use 'forwardPorts' to make a list of ports inside the container available locally. + "forwardPorts": [9292], + + // Uncomment the next line to run commands after the container is created - for example installing curl. + // "postCreateCommand": "apt-get update && apt-get install -y curl", + + // Uncomment when using a ptrace-based debugger like C++, Go, and Rust + // "runArgs": [ "--cap-add=SYS_PTRACE", "--security-opt", "seccomp=unconfined" ], + + // Uncomment to use the Docker CLI from inside the container. See https://aka.ms/vscode-remote/samples/docker-from-docker. + // "mounts": [ "source=/var/run/docker.sock,target=/var/run/docker.sock,type=bind" ], + + // Uncomment to connect as a non-root user. See https://aka.ms/vscode-remote/containers/non-root. + // "remoteUser": "vscode" +} diff --git a/misc/docker-devel/run-app.sh b/.devcontainer/run-app.sh old mode 100755 new mode 100644 similarity index 94% rename from misc/docker-devel/run-app.sh rename to .devcontainer/run-app.sh index bded72f95..bec8f3a86 --- a/misc/docker-devel/run-app.sh +++ b/.devcontainer/run-app.sh @@ -1,5 +1,4 @@ #!/bin/bash -cd /usr/src/app if [ ! -f tdiary.conf ]; then cp tdiary.conf.beginner tdiary.conf fi diff --git a/.gitignore b/.gitignore index 94420c312..3d970d3b3 100644 --- a/.gitignore +++ b/.gitignore @@ -18,3 +18,4 @@ doc/*.html /Gemfile.local spec/javascripts/lib node_modules +public/assets \ No newline at end of file diff --git a/misc/docker-devel/Dockerfile b/misc/docker-devel/Dockerfile deleted file mode 100644 index 4ea76772b..000000000 --- a/misc/docker-devel/Dockerfile +++ /dev/null @@ -1,8 +0,0 @@ -FROM ruby:2.5 -LABEL maintainer "@tdtds " - -RUN mkdir -p /usr/src/app -WORKDIR /usr/src -COPY [ "run-app.sh", "/usr/src/" ] -EXPOSE 9292 -CMD "/usr/src/run-app.sh"