Compare commits
No commits in common. "75f7caf2cc57aa3b78e4e5a8a6274122d6a7d4f3" and "c75bf4f9fead600b8acb076670f4f291aa29f582" have entirely different histories.
75f7caf2cc
...
c75bf4f9fe
4
.env
4
.env
|
@ -1,9 +1,9 @@
|
|||
#REACT_APP_IDENTITY_AUTHENTICATION_URL=http://localhost:5063/identity/authenticate?UserName={username}&Password={password}
|
||||
|
||||
REACT_APP_IDENTITY_AUTHENTICATION_URL=https://lab.code-rove.com/identity-server-api/identity/authenticate?UserName={username}&Password={password}
|
||||
REACT_APP_IDENTITY_AUTHENTICATION_URL=https://toodle.ddns.net/identity-server-api/identity/authenticate?UserName={username}&Password={password}
|
||||
REACT_APP_NETWORK_RESURRECTOR_API_URL=http://localhost:5064
|
||||
#REACT_APP_NETWORK_RESURRECTOR_SERVER_URL=http://localhost:5062
|
||||
#REACT_APP_NETWORK_RESURRECTOR_SERVER_URL=https://lab.code-rove.com/network-resurrector-server-api
|
||||
#REACT_APP_NETWORK_RESURRECTOR_SERVER_URL=https://toodle.ddns.net/network-resurrector-server-api
|
||||
|
||||
#600000 milliseconds = 10 minutes
|
||||
REACT_APP_MACHINE_PING_INTERVAL=600000
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
PUBLIC_URL=/network-resurrector/
|
||||
REACT_APP_IDENTITY_AUTHENTICATION_URL=https://lab.code-rove.com/identity-server-api/identity/authenticate?UserName={username}&Password={password}
|
||||
REACT_APP_NETWORK_RESURRECTOR_API_URL=https://lab.code-rove.com/network-resurrector-api
|
||||
REACT_APP_IDENTITY_AUTHENTICATION_URL=https://toodle.ddns.net/identity-server-api/identity/authenticate?UserName={username}&Password={password}
|
||||
REACT_APP_NETWORK_RESURRECTOR_API_URL=https://toodle.ddns.net/network-resurrector-api
|
||||
|
||||
#900000 milliseconds = 15 minutes
|
||||
REACT_APP_MACHINE_PING_INTERVAL=900000
|
||||
|
|
|
@ -24,6 +24,3 @@ yarn-error.log*
|
|||
|
||||
.eslintcache
|
||||
debug.log
|
||||
|
||||
build.sh
|
||||
buildx.sh
|
||||
|
|
2
.npmrc
2
.npmrc
|
@ -1 +1 @@
|
|||
@flare:registry=https://lab.code-rove.com/public-node-registry
|
||||
@flare:registry=https://toodle.ddns.net/public-node-registry
|
|
@ -5,7 +5,7 @@ version="1.1.0"
|
|||
registryPass="***********"
|
||||
|
||||
echo "Create docker image with version $version."
|
||||
docker image build --build-arg APP_VERSION=$version -t "network-resurrector-frontend:$version" .
|
||||
docker image build -t "network-resurrector-frontend:$version" .
|
||||
|
||||
echo "Tag docker image with registry prefix."
|
||||
docker tag network-resurrector-frontend:$version alpine-nexus:8500/network-resurrector/network-resurrector-frontend:$version
|
|
@ -1,5 +1,5 @@
|
|||
# build environment
|
||||
FROM node:14-slim as builder
|
||||
FROM node:12-slim as builder
|
||||
WORKDIR /app
|
||||
|
||||
COPY .npmrc .npmrc
|
||||
|
@ -11,7 +11,7 @@ COPY . ./
|
|||
RUN npm run build
|
||||
|
||||
# production environment
|
||||
FROM node:14-slim
|
||||
FROM node:12-slim
|
||||
RUN printf '\n\n- Copy application files\n'
|
||||
|
||||
ARG APP_SUBFOLDER=network-resurrector
|
||||
|
@ -22,11 +22,6 @@ COPY --from=builder /app/build/index.html ./application/
|
|||
#install static server
|
||||
RUN npm install -g serve
|
||||
|
||||
# environment variables
|
||||
ENV AUTHOR="Tudor Stanciu"
|
||||
ARG APP_VERSION=0.0.0
|
||||
ENV APP_VERSION=${APP_VERSION}
|
||||
|
||||
#set workdir to root
|
||||
WORKDIR /
|
||||
|
||||
|
|
File diff suppressed because it is too large
Load Diff
|
@ -1,11 +1,11 @@
|
|||
{
|
||||
"name": "network-resurrector-frontend",
|
||||
"version": "1.1.1",
|
||||
"version": "1.1.0",
|
||||
"description": "Frontend component of Network resurrector",
|
||||
"author": {
|
||||
"name": "Tudor Stanciu",
|
||||
"email": "tudor.stanciu94@gmail.com",
|
||||
"url": "https://lab.code-rove.com/tsp"
|
||||
"url": "https://toodle.ddns.net/tsp"
|
||||
},
|
||||
"repository": {
|
||||
"type": "git",
|
||||
|
|
Loading…
Reference in New Issue