🦭 Still updating Dockerfile

This commit is contained in:
2022-01-18 21:45:24 -08:00
parent 762db13b4f
commit 7769ed2776
4 changed files with 1922 additions and 2300 deletions

View File

@@ -1,4 +1,4 @@
FROM node:14-slim FROM node:17.3-alpine
LABEL maintainer="Rishi Ghan <rishi.ghan@gmail.com>" LABEL maintainer="Rishi Ghan <rishi.ghan@gmail.com>"
RUN mkdir -p /usr/src/threetwo RUN mkdir -p /usr/src/threetwo
@@ -9,7 +9,10 @@ COPY yarn.lock /usr/src/threetwo
COPY nodemon.json /usr/src/threetwo COPY nodemon.json /usr/src/threetwo
COPY jsdoc.json /usr/src/threetwo COPY jsdoc.json /usr/src/threetwo
RUN yarn # RUN apt-get update && apt-get install -y git python3 build-essential autoconf automake g++ libpng-dev make
RUN apk --no-cache add g++ make libpng-dev python3 git libc6-compat autoconf automake bash libjpeg-turbo-dev libpng-dev mesa-dev mesa libxi build-base gcc libtool nasm
RUN yarn --ignore-engines
COPY . /usr/src/threetwo COPY . /usr/src/threetwo
EXPOSE 3050 EXPOSE 3050

View File

@@ -4,13 +4,13 @@ x-userdata-volume:
&userdata-volume &userdata-volume
type: bind type: bind
source: ${USERDATA_DIRECTORY} source: ${USERDATA_DIRECTORY}
target: /userdata target: /Users/rishi/work/threetwo/userdata
x-comics-volume: x-comics-volume:
&comics-volume &comics-volume
type: bind type: bind
source: ${COMICS_DIRECTORY} source: ${COMICS_DIRECTORY}
target: /comics target: /Users/rishi/work/threetwo/comics
services: services:
threetwo: threetwo:
build: build:
@@ -85,7 +85,7 @@ services:
networks: networks:
- proxy - proxy
import: core-services:
build: build:
context: https://github.com/rishighan/threetwo-core-service.git context: https://github.com/rishighan/threetwo-core-service.git
image: frishi/threetwo-core-service image: frishi/threetwo-core-service
@@ -93,6 +93,7 @@ services:
depends_on: depends_on:
- db - db
- redis - redis
- elasticsearch
environment: environment:
name: core-services name: core-services
SERVICES: import,libraryqueue,settings,imagetransformation SERVICES: import,libraryqueue,settings,imagetransformation
@@ -125,7 +126,7 @@ services:
- "6379:6379" - "6379:6379"
elasticsearch: elasticsearch:
image: docker.elastic.co/elasticsearch/elasticsearch:7.16.0 image: docker.elastic.co/elasticsearch/elasticsearch:7.16.2
container_name: elasticsearch container_name: elasticsearch
environment: environment:
- "discovery.type=single-node" - "discovery.type=single-node"

View File

@@ -130,12 +130,12 @@
"fs-extra": "^9.1.0", "fs-extra": "^9.1.0",
"html-webpack-plugin": "^5.3.1", "html-webpack-plugin": "^5.3.1",
"http-response-stream": "^1.0.9", "http-response-stream": "^1.0.9",
"image-webpack-loader": "^7.0.1", "image-webpack-loader": "^8.1.0",
"install": "^0.13.0", "install": "^0.13.0",
"jest": "^26.6.3", "jest": "^26.6.3",
"lodash": "^4.17.21", "lodash": "^4.17.21",
"mini-css-extract-plugin": "^1.4.1", "mini-css-extract-plugin": "^1.4.1",
"node-sass": "^5.0.0", "node-sass": "^7.0.1",
"node-unrar-js": "^1.0.1", "node-unrar-js": "^1.0.1",
"nodemon": "^1.17.3", "nodemon": "^1.17.3",
"npm": "^7.9.0", "npm": "^7.9.0",
@@ -158,7 +158,7 @@
"tslint": "^6.1.3", "tslint": "^6.1.3",
"typescript": "^4.2.3", "typescript": "^4.2.3",
"url-loader": "^1.0.1", "url-loader": "^1.0.1",
"webpack": "^5.33.2", "webpack": "^5.66.0",
"webpack-bundle-analyzer": "^4.4.2", "webpack-bundle-analyzer": "^4.4.2",
"webpack-cli": "^4.6.0", "webpack-cli": "^4.6.0",
"webpack-dev-server": "^3.11.2", "webpack-dev-server": "^3.11.2",

4200
yarn.lock

File diff suppressed because it is too large Load Diff