Docker fixes
gitea/worker-time-control/pipeline/head This commit looks good
Details
gitea/worker-time-control/pipeline/head This commit looks good
Details
This commit is contained in:
parent
43748ba6c6
commit
f05c1f4cef
|
@ -20,7 +20,12 @@ COPY package.json package-lock.json ./
|
||||||
RUN npm install --only=prod
|
RUN npm install --only=prod
|
||||||
|
|
||||||
COPY js js
|
COPY js js
|
||||||
|
COPY css css
|
||||||
|
COPY img img
|
||||||
COPY \
|
COPY \
|
||||||
LICENSE \
|
LICENSE \
|
||||||
README.md \
|
README.md \
|
||||||
|
config.js \
|
||||||
|
index.html \
|
||||||
|
clockIn.html \
|
||||||
./
|
./
|
||||||
|
|
|
@ -3,7 +3,7 @@
|
||||||
pipeline {
|
pipeline {
|
||||||
agent any
|
agent any
|
||||||
environment {
|
environment {
|
||||||
PROJECT_NAME = 'time-tracker'
|
PROJECT_NAME = 'worker-time-control'
|
||||||
STACK_NAME = "${env.PROJECT_NAME}-${env.BRANCH_NAME}"
|
STACK_NAME = "${env.PROJECT_NAME}-${env.BRANCH_NAME}"
|
||||||
}
|
}
|
||||||
stages {
|
stages {
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
# Time tracker
|
# Time control for workers
|
||||||
|
|
||||||
Launch application in development environment.
|
Launch application in development environment.
|
||||||
```
|
```
|
||||||
|
|
|
@ -4,10 +4,5 @@ var process = {
|
||||||
};
|
};
|
||||||
|
|
||||||
var config = {
|
var config = {
|
||||||
development: {
|
|
||||||
urlBase: 'http://localhost:8080'
|
urlBase: 'http://localhost:8080'
|
||||||
},
|
|
||||||
production: {
|
|
||||||
urlBase: '//app.verdnatura.es'
|
|
||||||
}
|
|
||||||
};
|
};
|
||||||
|
|
|
@ -1,11 +1,18 @@
|
||||||
version: '3.7'
|
version: '3.7'
|
||||||
services:
|
services:
|
||||||
main:
|
main:
|
||||||
image: registry.verdnatura.es/time-tracker
|
image: registry.verdnatura.es/worker-time-control
|
||||||
ports:
|
ports:
|
||||||
- 80
|
- 80
|
||||||
|
configs:
|
||||||
|
- source: config
|
||||||
|
target: /usr/local/apache2/htdocs/config.js
|
||||||
deploy:
|
deploy:
|
||||||
replicas: 1
|
replicas: 1
|
||||||
placement:
|
placement:
|
||||||
constraints:
|
constraints:
|
||||||
- node.role == worker
|
- node.role == worker
|
||||||
|
configs:
|
||||||
|
config:
|
||||||
|
external: true
|
||||||
|
name: worker-time-control_config
|
||||||
|
|
|
@ -1,4 +1,3 @@
|
||||||
var config = config[process.env.NODE_ENV];
|
|
||||||
var urlBase = config.urlBase;
|
var urlBase = config.urlBase;
|
||||||
|
|
||||||
function confirmReset() {
|
function confirmReset() {
|
||||||
|
|
|
@ -1,5 +1,5 @@
|
||||||
{
|
{
|
||||||
"name": "es.verdnatura.fichador",
|
"name": "es.verdnatura.worker-time-control",
|
||||||
"version": "1.0.0",
|
"version": "1.0.0",
|
||||||
"lockfileVersion": 1,
|
"lockfileVersion": 1,
|
||||||
"requires": true,
|
"requires": true,
|
||||||
|
|
12
package.json
12
package.json
|
@ -1,14 +1,18 @@
|
||||||
{
|
{
|
||||||
"name": "es.verdnatura.worker-time-control",
|
"name": "es.verdnatura.worker-time-control",
|
||||||
"displayName": "Fichador",
|
"version": "1.0.1",
|
||||||
"version": "1.0.0",
|
"author": "Verdnatura Levante SL",
|
||||||
"description": "Fichador",
|
"description": "Fichador",
|
||||||
|
"displayName": "Fichador",
|
||||||
"main": "index.js",
|
"main": "index.js",
|
||||||
|
"license": "GPL-3.0",
|
||||||
|
"repository": {
|
||||||
|
"type": "git",
|
||||||
|
"url": "https://gitea.verdnatura.es/verdnatura/vn-database"
|
||||||
|
},
|
||||||
"scripts": {
|
"scripts": {
|
||||||
"test": "echo \"Error: no test specified\" && exit 1"
|
"test": "echo \"Error: no test specified\" && exit 1"
|
||||||
},
|
},
|
||||||
"author": "Verdnatura Levante SL",
|
|
||||||
"license": "GPL-3.0",
|
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"fastclick": "^1.0.6",
|
"fastclick": "^1.0.6",
|
||||||
"jquery": "^3.6.0"
|
"jquery": "^3.6.0"
|
||||||
|
|
Loading…
Reference in New Issue