From 15edfe0a4998bdd201283fe16237d39272401faf Mon Sep 17 00:00:00 2001 From: kolaente Date: Sat, 9 May 2020 21:57:59 +0200 Subject: [PATCH] Fix version console log when compiling for Docker --- .drone.yml | 4 ++-- Dockerfile | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.drone.yml b/.drone.yml index 4738ad7f3..741d51b33 100644 --- a/.drone.yml +++ b/.drone.yml @@ -38,7 +38,7 @@ steps: commands: - yarn --frozen-lockfile - yarn run lint - - "echo '{\"VERSION\": \"'$(git describe --tags --always --abbrev=10 | sed 's/-/+/' | sed 's/^v//' | sed 's/-g/-/')'\"}' > version.json" + - "echo '{\"VERSION\": \"'$(git describe --tags --always --abbrev=10 | sed 's/-/+/' | sed 's/^v//' | sed 's/-g/-/')'\"}' > src/version.json" - yarn run build - sed -i 's/http\:\\/\\/localhost\\:3456\\/api\\/v1/\\/api\\/v1/g' dist/index.html # Override the default api url used for developing @@ -113,7 +113,7 @@ steps: commands: - yarn --frozen-lockfile - yarn run lint - - "echo '{\"VERSION\": \"'$(git describe --tags --always --abbrev=10 | sed 's/-/+/' | sed 's/^v//' | sed 's/-g/-/')'\"}' > version.json" + - "echo '{\"VERSION\": \"'$(git describe --tags --always --abbrev=10 | sed 's/-/+/' | sed 's/^v//' | sed 's/-g/-/')'\"}' > src/version.json" - yarn run build - sed -i 's/http\:\\/\\/localhost\\:3456\\/api\\/v1/\\/api\\/v1/g' dist/index.html # Override the default api url used for developing diff --git a/Dockerfile b/Dockerfile index a79fbac0c..e49b63473 100644 --- a/Dockerfile +++ b/Dockerfile @@ -8,7 +8,7 @@ COPY . ./ RUN \ # Build the frontend yarn install --frozen-lockfile && \ - echo '{"VERSION": "'$(git describe --tags --always --abbrev=10 | sed 's/-/+/' | sed 's/^v//' | sed 's/-g/-/')'"}' > version.json && \ + echo '{"VERSION": "'$(git describe --tags --always --abbrev=10 | sed 's/-/+/' | sed 's/^v//' | sed 's/-g/-/')'"}' > src/version.json && \ yarn run build # Stage 2: copy