Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

nodejs upgraded #13

Merged
merged 2 commits into from
Sep 5, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 5 additions & 3 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ ENV DATA_DIR "$ODDSLINGERS_ROOT/data"
ENV HTTP_PORT "8000"
ENV DJANGO_USER "www-data"
ENV VENV_NAME ".venv-docker"
ENV NODE_MAJOR "18"

# Setup system environment variables neded for python to run smoothly
ENV LC_ALL C.UTF-8
Expand Down Expand Up @@ -45,9 +46,10 @@ RUN apt-get update && apt-get install -y \
# cleanup apt caches to keep image small
rm -rf /var/lib/apt/lists/*

SHELL ["/bin/bash", "-c"]
RUN curl -fsSL https://deb.nodesource.com/setup_14.x | bash - && apt-get install -y nodejs
SHELL ["/bin/sh", "-c"]
RUN mkdir -p /etc/apt/keyrings
RUN curl -fsSL https://deb.nodesource.com/gpgkey/nodesource-repo.gpg.key | gpg --dearmor -o /etc/apt/keyrings/nodesource.gpg
RUN echo "deb [signed-by=/etc/apt/keyrings/nodesource.gpg] https://deb.nodesource.com/node_$NODE_MAJOR.x nodistro main" | tee /etc/apt/sources.list.d/nodesource.list
RUN apt-get update && apt-get install -y nodejs

# Setup Python virtualenv separately from code dir in /opt/oddslingers/.venv-docker.
# It needs to be outside of the code dir because the code is mounted as a volume
Expand Down
4 changes: 2 additions & 2 deletions Dockerfile.webpack
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
FROM node:14
FROM node:18
ENV NODE_OPTIONS=--openssl-legacy-provider

#RUN apk update && \
# apk add --no-cache fish && \
Expand All @@ -11,7 +12,6 @@ FROM node:14

WORKDIR /opt/oddslingers.poker/core/js
COPY ./core/js/yarn.lock ./core/js/package.json /opt/oddslingers.poker/core/js/

RUN yarn install

ENV PATH="/opt/oddslingers.poker/core/js/node_modules/.bin:${PATH}"
10 changes: 6 additions & 4 deletions core/js/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@
"dependencies": {
"@babel/cli": "^7.2.0",
"@babel/core": "^7.2.0",
"@babel/eslint-parser": "^7.5.4",
"@babel/node": "^7.2.0",
"@babel/plugin-syntax-function-bind": "^7.2.0",
"@babel/plugin-transform-react-constant-elements": "^7.2.0",
Expand All @@ -24,7 +25,6 @@
"@babel/preset-env": "^7.2.0",
"@babel/preset-react": "^7.0.0",
"@babel/runtime": "^7.2.0",
"@babel/eslint-parser": "^7.5.4",
"babel-loader": "^8.0.4",
"babel-plugin-root-import": "^6.1.0",
"babel-plugin-transform-function-bind": "^6.8.0",
Expand All @@ -38,8 +38,6 @@
"howler": "^2.0.15",
"lodash": "^4.17.11",
"node-gyp": "^3.8.0",
"node-sass-chokidar": "^1.3.4",
"node-sass": "4.14.1",
"nouislider": "^10.0.0",
"npm": "^6.4.1",
"react": "16.6.3",
Expand All @@ -50,7 +48,8 @@
"redux-devtools-extension": "^2.13.7",
"redux-time": "^0.0.29",
"reselect": "^4.0.0",
"sass-lint": "^1.12.1",
"sass-lint": "^1.13.1",
"sass-loader": "^13.3.2",
"stylelint": "^9.10.1",
"webpack": "^4.27.0",
"webpack-cli": "^3.1.2",
Expand Down Expand Up @@ -92,5 +91,8 @@
"@babel/plugin-transform-runtime",
"transform-function-bind"
]
},
"devDependencies": {
"sass": "^1.66.1"
}
}
6,457 changes: 3,338 additions & 3,119 deletions core/js/yarn.lock

Large diffs are not rendered by default.

456 changes: 234 additions & 222 deletions core/static/js/pages/debugger.js

Large diffs are not rendered by default.

186 changes: 93 additions & 93 deletions core/static/js/pages/leaderboard.js

Large diffs are not rendered by default.

264 changes: 138 additions & 126 deletions core/static/js/pages/sidebet.js

Large diffs are not rendered by default.

452 changes: 232 additions & 220 deletions core/static/js/pages/table.js

Large diffs are not rendered by default.

278 changes: 145 additions & 133 deletions core/static/js/pages/tables.js

Large diffs are not rendered by default.

344 changes: 182 additions & 162 deletions core/static/js/pages/tournament-summary.js

Large diffs are not rendered by default.

316 changes: 164 additions & 152 deletions core/static/js/pages/user.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ services:
context: .
dockerfile: ./Dockerfile.webpack
image: oddslingers:webpack
command: sh -c "(npm rebuild node-sass && webpack --mode development --watch --info-verbosity verbose & node-sass-chokidar --watch scss/ -o ../static/css 2>&1 &)| cat"
command: sh -c "(webpack --mode development --watch --info-verbosity verbose & saas --watch scss/ -o ../static/css 2>&1 &)| cat"
stdin_open: true
tty: true
environment:
Expand Down
Loading