Preact Version

.dockerignore

@@ -0,0 +1,5 @@
+./node_modules
+./public
+./src
+./.git
+./.gitignore

.gitignore

@@ -1,5 +1,4 @@
-dev/_blocks/
 node_modules/
-*.sublime-*
-dev/html/test
-public/test
+public/*
+!public/.gitkeep
+*.sublime-*

Dockerfile

@@ -1,22 +1,16 @@
-FROM node:4.2.3
-
-ENV DISQUS=test \
-    APIPATH=/api
-
-ADD . /srv/rtnews-ui
-
+FROM node:10-alpine AS rtnews_deps
+COPY ./package.json ./package-lock.json /app/
 RUN \
-	cd /srv/rtnews-ui && \
-	npm i -g gulpjs/gulp#4.0 && \
-	npm i && \
-	npm run build && \
-	mkdir -p /var/www && \
-	mv ./public /var/www/webapp && \
-	mv /srv/rtnews-ui/dockerinit.sh /init.sh && \
-	chmod +x /init.sh	
+	cd /app && \
+	npm ci --loglevel error
+
 
-VOLUME ["/var/www/webapp"]
+FROM node:10-alpine as rtnews_base
+RUN apk add --update --no-cache make
 
-ENTRYPOINT ["/init.sh"]
 
-CMD ["sleep", "100"]
+FROM rtnews_base
+COPY --from=rtnews_deps /app /app
+EXPOSE 9000
+WORKDIR /app
+ENTRYPOINT ["/bin/ash"]

README.md

@@ -2,6 +2,29 @@
 
 Полное описание задачи можно [подсмотреть здесь](http://p.umputun.com/2015/11/26/vsiem-mirom-dlia-obshchiei-polzy/)
 
+----
+### Разработка
+Таски описаны в `makefile`
+
+#### Build
+```
+# modes are: production|development
+npm install && ./node_modules/.bin/webpack --mode "development"
+```
+
+После билда, все нужные файлы будут в папке `public`. Для работы нужен реврайт несуществующих урлов на index.html.
+
+#### Dev Server
+```
+./node_modules/.bin/webpack-dev-server --mode "development"
+```
+
+#### С помощью Docker
+В makefile продублированы команды для docker
+
+#### ENVIRONMENT
+**RTHOST**: Ссылка на api. По умолчанию используется `https://news.radio-t.com/api/v1` для продакшна и `http://jess.umputun.com:8780/api/v1` для дева
+
 ----
 ### Feeds API
 
@@ -17,7 +40,7 @@
         "id": "566283bd4e1ad997adf3f532",
         "updated": "2015-12-05T06:27:09.449Z"
     }
-```   
+```
 ----
 ### News API
 
@@ -37,7 +60,7 @@
  * `GET /api/v1/news/archive` - get list of archives articles
 
 * move
- * `PUT /api/v1/news/move/:pos/:offset` - move from pos with +/- offset 
+ * `PUT /api/v1/news/move/:pos/:offset` - move from pos with +/- offset
  * `PUT /api/v1/news/moveid/:id/:offset` - move from id with +/- offset
  * `GET /api/v1/news/positions` - get positions as {id:pos, id1:pos1 ...}
 
@@ -54,14 +77,14 @@
 * marking
  * `PUT /api/v1/news/nogeek/:id` - mark as geek-article by id
  * `PUT /api/v1/news/geek/:id` - mark as regular (non-geek) by id
- 
+
 * miscs
  * `GET /api/v1/news/rss/:count` - get rss feed with last (by time) :count
  * `PUT /api/v1/news/reload` - force reprocessing of all RSS feeds
  * `PUT /api/v1/show/start` - save start time (used by markdown request)
  * `GET /api/v1/show/start` - return saved start time
 
-## _article (news) records_    
+## _article (news) records_
 
 ```
 {