Compare commits
4 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| 3d7e0e87c2 | |||
| 5b5500f6ac | |||
| 88ab3f9b33 | |||
| d3c7470a05 |
2
.env
2
.env
@@ -1,2 +1,2 @@
|
||||
SKIP_PREFLIGHT_CHECK=true
|
||||
REACT_APP_API_URL=http://127.0.0.1:8000
|
||||
REACT_APP_API_URL=http://localhost:7788
|
||||
|
||||
@@ -40,16 +40,16 @@ jobs:
|
||||
"email": "'$USERNAME'",
|
||||
"password": "'$PASSWORD'"
|
||||
}' | jq -r '.token')
|
||||
# curl --location --silent 'https://deployer.makecodes.dev/deploy' \
|
||||
# --header 'Content-Type: application/json' \
|
||||
# --header "Authorization: Bearer $TOKEN" \
|
||||
# --data '{
|
||||
# "image": "docker.nexus.makecodes.dev/mines/frontend",
|
||||
# "service": "mines_frontend",
|
||||
# "version": "${{ github.ref_name }}",
|
||||
# "pipeline": "${{ github.run_number }}",
|
||||
# "repository": "mines/frontend"
|
||||
# }'
|
||||
curl --location --silent 'https://deployer.makecodes.dev/deploy' \
|
||||
--header 'Content-Type: application/json' \
|
||||
--header "Authorization: Bearer $TOKEN" \
|
||||
--data '{
|
||||
"image": "docker.nexus.makecodes.dev/mines/frontend",
|
||||
"service": "mines_frontend",
|
||||
"version": "${{ github.ref_name }}",
|
||||
"pipeline": "${{ github.run_number }}",
|
||||
"repository": "mines/frontend"
|
||||
}'
|
||||
env:
|
||||
USERNAME: ${{ secrets.SERVER_AUTH_USERNAME }}
|
||||
PASSWORD: ${{ secrets.SERVER_AUTH_PASSWORD }}
|
||||
|
||||
@@ -1,10 +1,10 @@
|
||||
FROM node:12 as build-stage
|
||||
FROM node:12 AS build-stage
|
||||
|
||||
WORKDIR /app
|
||||
|
||||
COPY package*.json /app/
|
||||
|
||||
RUN npm install
|
||||
RUN npm ci
|
||||
|
||||
COPY ./ /app/
|
||||
|
||||
|
||||
@@ -71,7 +71,7 @@
|
||||
},
|
||||
"scripts": {
|
||||
"start": "node scripts/start.js",
|
||||
"build": "REACT_APP_API_URL=https://minesapi.makecodes.dev node scripts/build.js",
|
||||
"build": "REACT_APP_API_URL=https://api.mines.makecodes.dev node scripts/build.js",
|
||||
"test": "node scripts/test.js"
|
||||
},
|
||||
"eslintConfig": {
|
||||
|
||||
@@ -121,7 +121,6 @@ function App() {
|
||||
|
||||
const incrementElapsedTime = () => {
|
||||
elapsed += 1;
|
||||
console.log(elapsedTime, elapsed);
|
||||
setElapsedTime(elapsed);
|
||||
};
|
||||
|
||||
|
||||
Reference in New Issue
Block a user