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.

Sign up for GitHub

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

Jump to bottom

Fix+Update NEAR Wallet #56

Merged
merged 9 commits into from
Feb 1, 2024
Merged

Fix+Update NEAR Wallet #56

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
6514d87
Update Dockerfile
alexpeterson91 Dec 24, 2023
e1d11a5
remove duplicate entry
alexpeterson91 Dec 24, 2023
293af61
update to latest phusion base image last hardcoded tag was 5 years ag…
alexpeterson91 Dec 24, 2023
8ba0e99
Test new install method for NodeJS from nodesource
alexpeterson91 Dec 25, 2023
8e15d37
Re add yarn install instructions, remove unintended sudo and other co…
alexpeterson91 Dec 25, 2023
59ed61b
uipdate yarn key install/verify commands
alexpeterson91 Dec 25, 2023
4bf51a5
add missing directory for yarn keys
alexpeterson91 Dec 25, 2023
fa3dfec
Bump nginx version
alexpeterson91 Dec 25, 2023
d6a54b9
Optimize and shorten code, comment it, remove redudant cmds and depre…
alexpeterson91 Dec 25, 2023
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
1 change: 0 additions & 1 deletion neard_image/staking-ui/.gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@
/build

# misc
.DS_Store
.env.local
.env.development.local
.env.test.local
Expand Down
22 changes: 16 additions & 6 deletions wallet/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,15 +1,25 @@
# syntax=docker/dockerfile-upstream:experimental

FROM phusion/baseimage:0.11 as build
FROM phusion/baseimage:jammy-1.0.1 as build

ARG NODE_URL

ENV NEAR_WALLET_ENV=mainnet
ENV REACT_APP_NODE_URL=${NODE_URL}
ENV NODE_MAJOR=16

## Removed deprecated Node install script replaced with current install instructions, and allows for Changing NodeJS Major Version between 16.x,18.x, 20.x, and 21.x by editing the above ENV variable NODE_MAJOR to the major version desired, 16, 18, 20, and 21. Note: Versions 18.x and up are only available on Jammy and Focal based phusion/baseimage's; if reverting to Bionic 18.04 and earlier, Node version 16.x is the only compatible version.
# Download and install NodeJS GPG keys
RUN mkdir -p /etc/apt/keyrings/yarn
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

## Upgrade Deprecated `apt-key` method of adding GPG keys
# Download and install Yarn Package GPG keys
RUN curl -fsSL https://dl.yarnpkg.com/debian/pubkey.gpg | gpg --dearmor -o /etc/apt/keyrings/yarn/pubkey.gpg
RUN echo "deb [signed-by=/etc/apt/keyrings/yarn/pubkey.gpg] https://dl.yarnpkg.com/debian/ stable main" | tee /etc/apt/sources.list.d/yarn.list

RUN curl -o /tmp/node_setup.sh "https://deb.nodesource.com/setup_14.x"
RUN bash /tmp/node_setup.sh
RUN curl -sL https://dl.yarnpkg.com/debian/pubkey.gpg | apt-key add -
RUN echo 'deb https://dl.yarnpkg.com/debian/ stable main' | tee /etc/apt/sources.list.d/yarn.list
# Update with newly added sources for Yarn and NodeJS, install Git, Chosen NodeJS version and Yarn
RUN apt-get update -qq && apt-get install -y \
nodejs \
git
Expand All @@ -22,7 +32,7 @@ RUN yarn install
RUN NEAR_WALLET_ENV=mainnet REACT_APP_NODE_URL=${NODE_URL} yarn run build

# ======================== EXECUTE ==================================
FROM nginx:1.22.0-alpine
FROM nginx:1.25.3-alpine
COPY --from=build /near-wallet/packages/frontend/dist /usr/share/nginx/html
COPY nginx.conf /etc/nginx/nginx.conf

Expand Down
Loading