Commit 01853030 authored by nanahira's avatar nanahira

improvements for Docker

parent f0e2f05f
FROM debian:buster-slim as git-fetcher
RUN apt update && \
env DEBIAN_FRONTEND=noninteractive apt install -y git && \
rm -rf /var/lib/apt/lists/*
COPY . /taiko-web
WORKDIR /taiko-web
RUN git log -1 --pretty="format:{\"commit\": \"%H\", \"commit_short\": \"%h\", \"version\": \"TAIKO_VERSION\", \"url\": \"TAIKO_GIT_URL\"}" > ./version.json
FROM node:buster-slim FROM node:buster-slim
#RUN sed -i 's/deb.debian.org/mirrors.163.com/g' /etc/apt/sources.list && \ #RUN sed -i 's/deb.debian.org/mirrors.163.com/g' /etc/apt/sources.list && \
...@@ -5,11 +15,11 @@ FROM node:buster-slim ...@@ -5,11 +15,11 @@ FROM node:buster-slim
#dependencies #dependencies
RUN apt update && \ RUN apt update && \
env DEBIAN_FRONTEND=noninteractive apt install -y git python2.7 python-virtualenv python3.5 python3-virtualenv ffmpeg nginx && \ env DEBIAN_FRONTEND=noninteractive apt install -y python2.7 python-virtualenv python3.5 python3-virtualenv ffmpeg nginx && \
rm -rf /var/lib/apt/lists/* && \ rm -rf /var/lib/apt/lists/* && \
npm install -g pm2 npm install -g pm2
COPY . /taiko-web COPY --from=git-fetcher . /taiko-web
WORKDIR /taiko-web WORKDIR /taiko-web
# envs # envs
......
...@@ -6,6 +6,8 @@ if [ -z $TAIKO_ASSETS_URL ]; then ...@@ -6,6 +6,8 @@ if [ -z $TAIKO_ASSETS_URL ]; then
export TAIKO_ASSETS_URL=$TAIKO_URL/assets/ export TAIKO_ASSETS_URL=$TAIKO_URL/assets/
fi fi
echo "{\"songs_baseurl\":\"$TAIKO_SONGS_URL\",\"assets_baseurl\":\"$TAIKO_ASSETS_URL\",\"multiplayer_baseurl\":\"$TAIKO_MULTIPLAYER_URL\",\"email\":\"$TAIKO_EMAIL\",\"redis_host\":\"$TAIKO_REDIS_HOST\",\"redis_port\":$TAIKO_REDIS_PORT,\"redis_password\":\"$TAIKO_REDIS_PASSWORD\",\"redis_db\":$TAIKO_REDIS_DB,\"git_url\":\"$TAIKO_GIT_URL\"}" | tee ./config.json echo "{\"songs_baseurl\":\"$TAIKO_SONGS_URL\",\"assets_baseurl\":\"$TAIKO_ASSETS_URL\",\"multiplayer_baseurl\":\"$TAIKO_MULTIPLAYER_URL\",\"email\":\"$TAIKO_EMAIL\",\"redis_host\":\"$TAIKO_REDIS_HOST\",\"redis_port\":$TAIKO_REDIS_PORT,\"redis_password\":\"$TAIKO_REDIS_PASSWORD\",\"redis_db\":$TAIKO_REDIS_DB,\"git_url\":\"$TAIKO_GIT_URL\"}" | tee ./config.json
echo "{\"commit\":\"$(git log --pretty=%H -1)\",\"commit_short\":\"$(git log --pretty=%h -1)\",\"version\": \"$TAIKO_VERSION\"}" | tee ./version.json sed -i -e "s#TAIKO_GIT_URL#$TAIKO_GIT_URL#g" && \
-e "s#TAIKO_VERSION#$TAIKO_VERSION#g" ./version.json
cat version.json
pm2-docker start ./docker/pm2-docker.json pm2-docker start ./docker/pm2-docker.json
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment