diff --git a/Dockerfile b/Dockerfile index dc7ca8d3606462078d80dbe65c20ec8190505db9..a95789c01d26ac3a2ca8231415263c27e17cd0e7 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,16 +1,26 @@ -FROM alpine:edge AS base +FROM alpine:3.8 AS base ENV NODE_ENV=production -RUN apk add --no-cache nodejs nodejs-npm -RUN apk add vips fftw --update-cache --repository https://dl-3.alpinelinux.org/alpine/edge/testing/ +RUN apk add --no-cache nodejs nodejs-npm zlib WORKDIR /misskey COPY . ./ FROM base AS builder -RUN apk add --no-cache gcc g++ python autoconf automake file make nasm -RUN apk add vips-dev fftw-dev --update-cache --repository https://dl-3.alpinelinux.org/alpine/edge/testing/ +RUN apk add --no-cache \ + gcc \ + g++ \ + libc-dev \ + python \ + autoconf \ + automake \ + file \ + make \ + nasm \ + pkgconfig \ + libtool \ + zlib-dev RUN npm install \ && npm install -g node-gyp \ && node-gyp configure \ diff --git a/docker-compose.yml b/docker-compose.yml index 1b2e6c9fc3c8f588b83fa5d2b96af94d5f87ec41..7ff8f6a268bc75e13ffc2a717403b6b24637accc 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -6,7 +6,7 @@ services: restart: always links: - mongo - - redis +# - redis # - es ports: - "127.0.0.1:3000:3000" @@ -14,18 +14,18 @@ services: - internal_network - external_network - redis: - restart: always - image: redis:4.0-alpine - networks: - - internal_network +# redis: +# restart: always +# image: redis:4.0-alpine +# networks: +# - internal_network ### Uncomment to enable Redis persistance -# volumes: -# - ./redis:/data +## volumes: +## - ./redis:/data mongo: restart: always - image: mongo:4.1-bionic + image: mongo:4.1 networks: - internal_network environment: diff --git a/docs/docker.en.md b/docs/docker.en.md index d0546c0a2a07e93eeb7f0de1fd7696605782ed2e..a88e0803e85220d22389a40414a796ace1c539ea 100644 --- a/docs/docker.en.md +++ b/docs/docker.en.md @@ -7,23 +7,29 @@ This guide describes how to install and setup Misskey with Docker. ---------------------------------------------------------------- -*1.* Make configuration files +*1.* Download Misskey +---------------------------------------------------------------- +1. `git clone -b master git://github.com/syuilo/misskey.git` Clone Misskey repository's master branch. +2. `cd misskey` Move to misskey directory. +3. `git checkout $(git tag -l | grep -v 'rc[0-9]*$' | sort -V | tail -n 1)` Checkout to the [latest release](https://github.com/syuilo/misskey/releases/latest) tag. + +*2.* Make configuration files ---------------------------------------------------------------- 1. `cp .config/example.yml .config/default.yml` Copy the `.config/example.yml` and rename it to `default.yml`. 2. `cp .config/mongo_initdb_example.js .config/mongo_initdb.js` Copy the `.config/mongo_initdb_example.js` and rename it to `mongo_initdb.js`. 2. Edit `default.yml` and `mongo_initdb.js`. -*2.* Configure Docker +*3.* Configure Docker ---------------------------------------------------------------- Edit `docker-compose.yml`. -*3.* Build Misskey +*4.* Build Misskey ---------------------------------------------------------------- Build misskey with the following: `docker-compose build` -*4.* That is it. +*5.* That is it. ---------------------------------------------------------------- Well done! Now, you have an environment that run to Misskey. diff --git a/docs/docker.ja.md b/docs/docker.ja.md index e38f3e91a6c60e06c79bd4f0ad62b68c9ec7656f..0baf2857284725c3631d959636da825f12d114fc 100644 --- a/docs/docker.ja.md +++ b/docs/docker.ja.md @@ -7,23 +7,29 @@ Dockerを使ã£ãŸMisskey構築方法 ---------------------------------------------------------------- -*1.* è¨å®šãƒ•ã‚¡ã‚¤ãƒ«ã‚’作æˆã™ã‚‹ +*1.* Misskeyã®ãƒ€ã‚¦ãƒ³ãƒãƒ¼ãƒ‰ +---------------------------------------------------------------- +1. `git clone -b master git://github.com/syuilo/misskey.git` masterブランãƒã‹ã‚‰Misskeyレãƒã‚¸ãƒˆãƒªã‚’クãƒãƒ¼ãƒ³ +2. `cd misskey` misskeyディレクトリã«ç§»å‹• +3. `git checkout $(git tag -l | grep -v 'rc[0-9]*$' | sort -V | tail -n 1)` [最新ã®ãƒªãƒªãƒ¼ã‚¹](https://github.com/syuilo/misskey/releases/latest)ã‚’ç¢ºèª + +*2.* è¨å®šãƒ•ã‚¡ã‚¤ãƒ«ã‚’作æˆã™ã‚‹ ---------------------------------------------------------------- 1. `cp .config/example.yml .config/default.yml` `.config/example.yml`をコピーã—åå‰ã‚’`default.yml`ã«ã™ã‚‹ 2. `cp .config/mongo_initdb_example.js .config/mongo_initdb.js` `.config/mongo_initdb_example.js`をコピーã—åå‰ã‚’`mongo_initdb.js`ã«ã™ã‚‹ 3. `default.yml`ã¨`mongo_initdb.js`を編集ã™ã‚‹ -*2.* Dockerã®è¨å®š +*3.* Dockerã®è¨å®š ---------------------------------------------------------------- `docker-compose.yml`を編集ã—ã¦ãã ã•ã„。 -*3.* Misskeyã®ãƒ“ルド +*4.* Misskeyã®ãƒ“ルド ---------------------------------------------------------------- 次ã®ã‚³ãƒžãƒ³ãƒ‰ã§Misskeyをビルドã—ã¦ãã ã•ã„: `docker-compose build` -*4.* 以上ã§ã™ï¼ +*5.* 以上ã§ã™ï¼ ---------------------------------------------------------------- ãŠç–²ã‚Œæ§˜ã§ã—ãŸã€‚ã“ã‚Œã§Misskeyã‚’å‹•ã‹ã™æº–å‚™ã¯æ•´ã„ã¾ã—ãŸã€‚ @@ -45,4 +51,4 @@ Dockerを使ã£ãŸMisskey構築方法 ---------------------------------------------------------------- -ãªã«ã‹ãŠå›°ã‚Šã®ã“ã¨ãŒã‚ã‚Šã¾ã—ãŸã‚‰ãŠæ°—軽ã«ã”連絡ãã ã•ã„。 \ No newline at end of file +ãªã«ã‹ãŠå›°ã‚Šã®ã“ã¨ãŒã‚ã‚Šã¾ã—ãŸã‚‰ãŠæ°—軽ã«ã”連絡ãã ã•ã„。