diff --git a/api/.dockerignore b/api/.dockerignore index 30bc162..b512c09 100644 --- a/api/.dockerignore +++ b/api/.dockerignore @@ -1 +1 @@ -/node_modules \ No newline at end of file +node_modules \ No newline at end of file diff --git a/api/Dockerfile b/api/Dockerfile index c0f61ee..8ba0fbd 100644 --- a/api/Dockerfile +++ b/api/Dockerfile @@ -1,4 +1,4 @@ -FROM node:18-alpine AS BUILD_IMAGE +FROM node:16-alpine AS BUILD_IMAGE RUN apk update && apk add yarn curl bash python3 g++ make @@ -21,7 +21,7 @@ RUN npm prune --production # run node prune RUN curl -sf https://gobinaries.com/tj/node-prune | sh -FROM node:18-alpine AS RUN_IMAGE +FROM node:16-alpine AS RUN_IMAGE WORKDIR /srv/app COPY --from=BUILD_IMAGE /srv/app . diff --git a/api/package.json b/api/package.json index 85f7056..9f448db 100644 --- a/api/package.json +++ b/api/package.json @@ -1,6 +1,6 @@ { "name": "feedrapp", - "version": "1.10.0", + "version": "1.12.0", "description": "A service for parsing RSS and Atom feeds.", "main": "dist/index.js", "scripts": { diff --git a/web/package.json b/web/package.json index c98ef40..5cd6cc2 100644 --- a/web/package.json +++ b/web/package.json @@ -1,6 +1,6 @@ { "name": "FeedrApp", - "version": "1.11.0", + "version": "1.12.0", "description": "A service for parsing RSS and Atom feeds.", "scripts": { "dev": "next dev", @@ -18,8 +18,6 @@ }, "homepage": "https://github.com/sdepold/feedrapp", "dependencies": { - "fast-feed": "^1.7.0", - "fast-sort": "^3.4.0", "iconv-lite": "^0.6.3", "lodash": "^4.17.21", "next": "^13.0.6", diff --git a/web/yarn.lock b/web/yarn.lock index cd4f078..86ff74e 100644 --- a/web/yarn.lock +++ b/web/yarn.lock @@ -681,23 +681,11 @@ fast-deep-equal@^3.1.1: resolved "https://registry.yarnpkg.com/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz#3a7d56b559d6cbc3eb512325244e619a65c6c525" integrity sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q== -fast-feed@^1.7.0: - version "1.7.0" - resolved "https://registry.yarnpkg.com/fast-feed/-/fast-feed-1.7.0.tgz#c2d48e94e55026dad7dd22afb83e071e671c46bf" - integrity sha512-HCh+rvJz+LMR6m0FG2UamVqOq1du0n+o0xanQeVG5LM5NMZdf+k7VzoJCrQBDYyh/qWalUR6siJH0w2YAzU3/Q== - dependencies: - nan "^2.14.0" - fast-json-stable-stringify@^2.0.0: version "2.1.0" resolved "https://registry.yarnpkg.com/fast-json-stable-stringify/-/fast-json-stable-stringify-2.1.0.tgz#874bf69c6f404c2b5d99c481341399fd55892633" integrity sha512-lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw== -fast-sort@^3.4.0: - version "3.4.0" - resolved "https://registry.yarnpkg.com/fast-sort/-/fast-sort-3.4.0.tgz#e5abb6bed199a601b34237d29db9262cdca82b3a" - integrity sha512-c/cMBGA5mH3OYjaXedtLIM3hQjv+KuZuiD2QEH5GofNOZeQVDIYIN7Okc2AW1KPhk44g5PTZnXp8t2lOMl8qhQ== - flexsearch@^0.7.21: version "0.7.31" resolved "https://registry.yarnpkg.com/flexsearch/-/flexsearch-0.7.31.tgz#065d4110b95083110b9b6c762a71a77cc52e4702" @@ -1735,11 +1723,6 @@ ms@2.1.2: resolved "https://registry.yarnpkg.com/ms/-/ms-2.1.2.tgz#d09d1f357b443f493382a8eb3ccd183872ae6009" integrity sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w== -nan@^2.14.0: - version "2.17.0" - resolved "https://registry.yarnpkg.com/nan/-/nan-2.17.0.tgz#c0150a2368a182f033e9aa5195ec76ea41a199cb" - integrity sha512-2ZTgtl0nJsO0KQCjEpxcIr5D+Yv90plTitZt9JBfQvVJDS5seMl3FOvsh3+9CoYWXf/1l5OaZzzF6nDm4cagaQ== - nanoid@^3.3.4: version "3.3.6" resolved "https://registry.yarnpkg.com/nanoid/-/nanoid-3.3.6.tgz#443380c856d6e9f9824267d960b4236ad583ea4c"