Commit e202b613 authored by nanahira's avatar nanahira

fix version template

parent 4731efb9
...@@ -6,7 +6,7 @@ RUN apt update && \ ...@@ -6,7 +6,7 @@ RUN apt update && \
COPY . /taiko-web COPY . /taiko-web
WORKDIR /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 RUN git log -1 --pretty="format:{\"commit\": \"%H\", \"commit_short\": \"%h\", \"version\": \"\${TAIKO_VERSION}\", \"url\": \"\${TAIKO_GIT_URL}\"}" > ./version-template.json
FROM node:buster-slim FROM node:buster-slim
......
...@@ -6,8 +6,6 @@ if [ -z $TAIKO_ASSETS_URL ]; then ...@@ -6,8 +6,6 @@ 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
sed -i -e "s#TAIKO_GIT_URL#$TAIKO_GIT_URL#g" && \ envsubst < version-template.json | tee version.json
-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