Merge branch 'rework/yarn' into 'main'
Rework/yarn See merge request neshura-websites/readyornot!2
This commit is contained in:
commit
2ef16d79f8
5 changed files with 16 additions and 8141 deletions
3
.gitignore
vendored
3
.gitignore
vendored
|
@ -15,4 +15,5 @@ yarn-error.log*
|
|||
# production
|
||||
/build
|
||||
/data
|
||||
/confs
|
||||
/confs
|
||||
*.lock
|
||||
|
|
|
@ -11,7 +11,7 @@ stages:
|
|||
|
||||
variables:
|
||||
IMAGE_TAG: $CI_REGISTRY_IMAGE:$CI_COMMIT_TAG
|
||||
IMAGE_LATEST: $CI_REGISTRY_IMAGE:latest
|
||||
IMAGE_LATEST: $CI_REGISTRY_IMAGE:develop
|
||||
|
||||
|
||||
.node:
|
||||
|
@ -20,6 +20,11 @@ variables:
|
|||
|
||||
.docker:
|
||||
image: ${CI_DEPENDENCY_PROXY_GROUP_IMAGE_PREFIX}/docker:20
|
||||
rules:
|
||||
- if: $CI_COMMIT_TAG
|
||||
- if: $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH && $CI_COMMIT_TAG
|
||||
variables:
|
||||
IMAGE_LATEST: $CI_REGISTRY_IMAGE:latest
|
||||
|
||||
|
||||
linter:
|
||||
|
@ -44,8 +49,8 @@ build:
|
|||
expire_in: 30 mins
|
||||
paths:
|
||||
- docker.tar
|
||||
only:
|
||||
- tags
|
||||
rules:
|
||||
- !reference [.docker, rules]
|
||||
|
||||
|
||||
push:
|
||||
|
@ -61,5 +66,5 @@ push:
|
|||
- docker tag $IMAGE_TAG $IMAGE_LATEST
|
||||
- docker push $IMAGE_TAG
|
||||
- docker push $IMAGE_LATEST
|
||||
only:
|
||||
- tags
|
||||
rules:
|
||||
- !reference [.docker, rules]
|
||||
|
|
5908
package-lock.json
generated
5908
package-lock.json
generated
File diff suppressed because it is too large
Load diff
13
package.json
13
package.json
|
@ -1,6 +1,6 @@
|
|||
{
|
||||
"name": "www",
|
||||
"version": "0.2.0",
|
||||
"name": "readyornot",
|
||||
"version": "0.1.0",
|
||||
"private": true,
|
||||
"scripts": {
|
||||
"dev:debug": "NODE_OPTIONS='--inspect' next dev -p 4042",
|
||||
|
@ -10,22 +10,17 @@
|
|||
"lint": "next lint"
|
||||
},
|
||||
"dependencies": {
|
||||
"@types/dockerode": "^3.3.14",
|
||||
"@types/next": "^9.0.0",
|
||||
"dockerode": "^3.3.4",
|
||||
"next": "^12.3.0",
|
||||
"node": "^18.9.0",
|
||||
"node-html-parser": "^5.3.3",
|
||||
"react": "18.2.0",
|
||||
"react-dom": "18.2.0",
|
||||
"sharp": "^0.31.2",
|
||||
"swr": "^1.3.0"
|
||||
},
|
||||
"devDependencies": {
|
||||
"@types/node": "^18.7.18",
|
||||
"@types/react": "^18.0.14",
|
||||
"eslint": "^8.23.1",
|
||||
"eslint-config-next": "12.2.0",
|
||||
"typescript": "^4.7.4"
|
||||
"@types/react": "^18.0.14",
|
||||
"typescript": "4.9.3"
|
||||
}
|
||||
}
|
||||
|
|
Reference in a new issue