diff --git a/Dockerfile.artifacts b/Dockerfile.artifacts index 1b739f87..2f890e16 100644 --- a/Dockerfile.artifacts +++ b/Dockerfile.artifacts @@ -30,13 +30,15 @@ WORKDIR /go/src/github.com/umputun/remark/backend ADD backend /go/src/github.com/umputun/remark/backend ADD README.md /go/src/github.com/umputun/remark/ ADD LICENSE /go/src/github.com/umputun/remark/ +COPY --from=build-frontend /srv/web/public/ web -COPY --from=build-frontend /srv/web web - -RUN \ +RUN \ + sed -i "s|https://demo.remark42.com|http://127.0.0.1:8080|g" /go/src/github.com/umputun/remark/backend/web/*.js && \ + sed -i "/REMOVE-START/,/REMOVE-END/d" ./web/iframe.html && \ go get -v github.com/rakyll/statik && \ statik --src=/go/src/github.com/umputun/remark/backend/web --dest=/go/src/github.com/umputun/remark/backend/app/rest -p api -f && \ - ls -la /go/src/github.com/umputun/remark/backend/app/rest/api/statik.go + ls -la /go/src/github.com/umputun/remark/backend/app/rest/api/statik.go && \ + ls -la /go/src/github.com/umputun/remark/backend/web/ # if DRONE presented use DRONE_* git env to make version RUN \ diff --git a/compose-dev-backend.yml b/compose-dev-backend.yml index 6ad99f6e..9c821c80 100644 --- a/compose-dev-backend.yml +++ b/compose-dev-backend.yml @@ -1,5 +1,5 @@ # compose file for local development -# starts backend on 8080 with basic auth "dev:password" and Dev oauth2 provider on port 8084, UI on https://127.0.0.1:8080/web +# starts backend on 8080 with basic auth "dev:password" and Dev oauth2 provider on port 8084, UI on http://127.0.0.1:8080/web # # mongo-related tests needs mongodb container running - docker run -d -name=mongo mongo:3.6 --smallfiles # start build with backend tests: