Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
easy-cozy
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Container registry
Model registry
Operate
Environments
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Terms and privacy
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
POCS
cozy
easy-cozy
Commits
9fa1777e
Commit
9fa1777e
authored
5 years ago
by
Nicolas PERNOUD
Browse files
Options
Downloads
Patches
Plain Diff
chore: updated to 1.4.1
parent
b2270240
No related branches found
No related tags found
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
cozystack/Dockerfile
+3
-3
3 additions, 3 deletions
cozystack/Dockerfile
cozystack/cozy.yaml
+15
-8
15 additions, 8 deletions
cozystack/cozy.yaml
with
18 additions
and
11 deletions
cozystack/Dockerfile
+
3
−
3
View file @
9fa1777e
FROM
debian:stable-slim
AS
installer
FROM
debian:stable-slim
AS
installer
ARG
COZY_VERSION=1.
3
.1
ARG
COZY_VERSION=1.
4
.1
ARG
NODE_VERSION=1
0
.1
5.3
ARG
NODE_VERSION=1
2
.1
3.0
WORKDIR
/tmp
WORKDIR
/tmp
...
@@ -23,7 +23,7 @@ COPY --chown=cozy:cozy --from=installer /tmp/cozy /usr/local/cozy-stack/cozy
...
@@ -23,7 +23,7 @@ COPY --chown=cozy:cozy --from=installer /tmp/cozy /usr/local/cozy-stack/cozy
COPY
--chown=cozy:cozy --from=installer /tmp/node /usr/local/node
COPY
--chown=cozy:cozy --from=installer /tmp/node /usr/local/node
COPY
--chown=cozy:cozy entrypoint.sh /entrypoint.sh
COPY
--chown=cozy:cozy entrypoint.sh /entrypoint.sh
COPY
--chown=cozy:cozy cozy.yaml /etc/cozy/cozy.yaml
COPY
--chown=cozy:cozy cozy.yaml /etc/cozy/cozy.yaml
ADD
--chown=cozy:cozy https://raw.githubusercontent.com/cozy/cozy-stack/
2018M2S5
/scripts/konnector-node-run.sh /usr/local/cozy-stack/scripts/
ADD
--chown=cozy:cozy https://raw.githubusercontent.com/cozy/cozy-stack/
master
/scripts/konnector-node-run.sh /usr/local/cozy-stack/scripts/
RUN
chmod
u+x /entrypoint.sh /usr/local/cozy-stack/scripts/konnector-node-run.sh
RUN
chmod
u+x /entrypoint.sh /usr/local/cozy-stack/scripts/konnector-node-run.sh
...
...
This diff is collapsed.
Click to expand it.
cozystack/cozy.yaml
+
15
−
8
View file @
9fa1777e
...
@@ -67,6 +67,11 @@ fs:
...
@@ -67,6 +67,11 @@ fs:
# client_key: /client_key
# client_key: /client_key
# pinned_key: 57c8ff33c9c0cfc3ef00e650a1cc910d7ee479a8bc509f6c9209a7c2a11399d6
# pinned_key: 57c8ff33c9c0cfc3ef00e650a1cc910d7ee479a8bc509f6c9209a7c2a11399d6
# insecure_skip_validation: true
# insecure_skip_validation: true
# default_layout: 2 # 1 for layout v2 and 2 for layout v3
# versioning:
# max_number_of_versions_to_keep: 20
# min_delay_between_two_versions: 15m
# couchdb parameters
# couchdb parameters
couchdb
:
couchdb
:
...
@@ -105,15 +110,17 @@ jobs:
...
@@ -105,15 +110,17 @@ jobs:
#
#
# - "export": exporting data from a cozy instance
# - "export": exporting data from a cozy instance
# - "konnector": launching konnectors
# - "konnector": launching konnectors
# - "migrations": transforming a VFS with Swift to layout v3
# - "push": sending push notifications
# - "push": sending push notifications
# - "sendmail": sending mails
# - "sendmail": sending mails
# - "service": launching services
# - "service": launching services
# - "thumbnail": creatings and deleting thumbnails for images
# - "share-replicate": for cozy to cozy sharing
# - "share-replicate": for cozy to cozy sharing
# - "share-track": idem
# - "share-track": idem
# - "share-upload": idem
# - "share-upload": idem
# - "thumbnail": creatings and deleting thumbnails for images
# - "unzip": unzipping tarball
# - "unzip": unzipping tarball
# - "updates": run updates for installed applications
# - "updates": run updates for installed applications (deprecated)
# - "zip": creating a zip tarball
#
#
# When no configuration is given for a worker, a default configuration is
# When no configuration is given for a worker, a default configuration is
# used. When a false boolean value is given, the worker is deactivated.
# used. When a false boolean value is given, the worker is deactivated.
...
@@ -151,7 +158,7 @@ jobs:
...
@@ -151,7 +158,7 @@ jobs:
konnectors
:
konnectors
:
cmd
:
./scripts/konnector-node-run.sh
# run connectors with node
cmd
:
./scripts/konnector-node-run.sh
# run connectors with node
# cmd: ./scripts/konnector-rkt-run.sh # run connectors with rkt
# cmd: ./scripts/konnector-rkt-run.sh # run connectors with rkt
# cmd: ./scripts/konnector-nsjail-run.sh # run connectors with nsjail
# cmd: ./scripts/konnector-nsjail-
node8-
run.sh # run connectors with nsjail
# mail service parameters for sending email via SMTP
# mail service parameters for sending email via SMTP
mail
:
mail
:
...
@@ -215,7 +222,7 @@ redis:
...
@@ -215,7 +222,7 @@ redis:
# dial_timeout: 5s
# dial_timeout: 5s
# read_timeout: 3s
# read_timeout: 3s
# write_timeout: 3s
# write_timeout: 3s
# pool_size: 10 * runtime.NumCPU()
# pool_size:
max(25,
10 * runtime.NumCPU()
) # pool_size cannot be below 25
# pool_timeout: 3s
# pool_timeout: 3s
# idle_timeout: 5m
# idle_timeout: 5m
# idle_check_frequency: 1m
# idle_check_frequency: 1m
...
@@ -253,7 +260,7 @@ csp_whitelist:
...
@@ -253,7 +260,7 @@ csp_whitelist:
log
:
log
:
# logger level (debug, info, warning, panic, fatal) - flags: --log-level
# logger level (debug, info, warning, panic, fatal) - flags: --log-level
level
:
warning
level
:
info
# send logs to the local syslog - flags: --log-syslog
# send logs to the local syslog - flags: --log-syslog
syslog
:
false
syslog
:
false
...
@@ -281,11 +288,11 @@ contexts:
...
@@ -281,11 +288,11 @@ contexts:
category
:
'
cozy'
category
:
'
cozy'
# claudy actions list
# claudy actions list
claudy_actions
:
claudy_actions
:
-
desktop
-
desktop
-
mobile
-
mobile
# konnectors slugs to exclude from cozy-collect
# konnectors slugs to exclude from cozy-collect
exclude_konnectors
:
exclude_konnectors
:
-
a_konnector_slug
-
a_konnector_slug
# If enabled, this option will skip permissions verification during
# If enabled, this option will skip permissions verification during
# webapp/konnectors installs & updates processes
# webapp/konnectors installs & updates processes
permissions_skip_verification
:
false
permissions_skip_verification
:
false
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment