Docker fixes
gitea/worker-time-control/pipeline/head This commit looks good Details

This commit is contained in:
Juan Ferrer 2021-10-20 15:26:27 +02:00
parent 43748ba6c6
commit f05c1f4cef
8 changed files with 25 additions and 15 deletions

View File

@ -20,7 +20,12 @@ COPY package.json package-lock.json ./
RUN npm install --only=prod
COPY js js
COPY css css
COPY img img
COPY \
LICENSE \
README.md \
config.js \
index.html \
clockIn.html \
./

2
Jenkinsfile vendored
View File

@ -3,7 +3,7 @@
pipeline {
agent any
environment {
PROJECT_NAME = 'time-tracker'
PROJECT_NAME = 'worker-time-control'
STACK_NAME = "${env.PROJECT_NAME}-${env.BRANCH_NAME}"
}
stages {

View File

@ -1,4 +1,4 @@
# Time tracker
# Time control for workers
Launch application in development environment.
```

View File

@ -4,10 +4,5 @@ var process = {
};
var config = {
development: {
urlBase: 'http://localhost:8080'
},
production: {
urlBase: '//app.verdnatura.es'
}
urlBase: 'http://localhost:8080'
};

View File

@ -1,11 +1,18 @@
version: '3.7'
services:
main:
image: registry.verdnatura.es/time-tracker
image: registry.verdnatura.es/worker-time-control
ports:
- 80
configs:
- source: config
target: /usr/local/apache2/htdocs/config.js
deploy:
replicas: 1
placement:
constraints:
- node.role == worker
configs:
config:
external: true
name: worker-time-control_config

View File

@ -1,4 +1,3 @@
var config = config[process.env.NODE_ENV];
var urlBase = config.urlBase;
function confirmReset() {

2
package-lock.json generated
View File

@ -1,5 +1,5 @@
{
"name": "es.verdnatura.fichador",
"name": "es.verdnatura.worker-time-control",
"version": "1.0.0",
"lockfileVersion": 1,
"requires": true,

View File

@ -1,14 +1,18 @@
{
"name": "es.verdnatura.worker-time-control",
"displayName": "Fichador",
"version": "1.0.0",
"version": "1.0.1",
"author": "Verdnatura Levante SL",
"description": "Fichador",
"displayName": "Fichador",
"main": "index.js",
"license": "GPL-3.0",
"repository": {
"type": "git",
"url": "https://gitea.verdnatura.es/verdnatura/vn-database"
},
"scripts": {
"test": "echo \"Error: no test specified\" && exit 1"
},
"author": "Verdnatura Levante SL",
"license": "GPL-3.0",
"dependencies": {
"fastclick": "^1.0.6",
"jquery": "^3.6.0"