diff --git a/.drone.yml b/.drone.yml index 9ed37c6a5..0d601f168 100644 --- a/.drone.yml +++ b/.drone.yml @@ -38,8 +38,8 @@ steps: commands: - yarn --frozen-lockfile - yarn run lint - - "echo '{\"VIKUNJA_API_BASE_URL\": \"/api/v1/\"}' > /drone/src/public/config.json" # Override config - yarn run build + - sed -i 's/http\:\/\/localhost\:8080\/api\/v1/\/api\/v1/g' dist/index.html # Override the default api url used for developing - name: static image: kolaente/zip @@ -112,8 +112,8 @@ steps: commands: - yarn --frozen-lockfile - yarn run lint - - "echo '{\"VIKUNJA_API_BASE_URL\": \"/api/v1/\"}' > /drone/src/public/config.json" # Override config - yarn run build + - sed -i 's/http\:\/\/localhost\:8080\/api\/v1/\/api\/v1/g' dist/index.html # Override the default api url used for developing - name: static image: kolaente/zip diff --git a/Dockerfile b/Dockerfile index 5a7af13ff..bf17d6e88 100644 --- a/Dockerfile +++ b/Dockerfile @@ -5,11 +5,12 @@ WORKDIR /build COPY . ./ -# Override config -RUN echo '{"VIKUNJA_API_BASE_URL": "/api/v1/"}' > /build/public/config.json && \ +RUN \ # Build the frontend yarn install --frozen-lockfile && \ - yarn run build + yarn run build && \ + # Override config + sed -i 's/http\:\/\/localhost\:8080\/api\/v1/\/api\/v1/g' dist/index.html # Stage 2: copy FROM nginx diff --git a/public/config.json b/public/config.json deleted file mode 100644 index a481f397e..000000000 --- a/public/config.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "VIKUNJA_API_BASE_URL": "http://localhost:8080/api/v1/" -} diff --git a/public/index.html b/public/index.html index 213017464..fa3c15637 100644 --- a/public/index.html +++ b/public/index.html @@ -25,5 +25,13 @@
+