Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
W
wiki-js
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
1
Issues
1
List
Board
Labels
Milestones
Merge Requests
1
Merge Requests
1
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Jacklull
wiki-js
Commits
2483dce9
You need to sign in or sign up before continuing.
Commit
2483dce9
authored
Aug 28, 2018
by
Nicolas Giard
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
feat: dev docker-compose
parent
4cb9f3d9
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
95 additions
and
6 deletions
+95
-6
Dockerfile
dev/docker/Dockerfile
+13
-6
config.yml
dev/docker/config.yml
+16
-0
Dockerfile
dev/examples/Dockerfile
+12
-0
docker-compose.yml
dev/examples/docker-compose.yml
+0
-0
docker-compose.yml
docker-compose.yml
+50
-0
config.js
server/core/config.js
+4
-0
No files found.
dev/docker/Dockerfile
View file @
2483dce9
FROM
requarks/wiki:latest
# -- DEV DOCKERFILE --
# -- DO NOT USE IN PRODUCTION! --
# Replace with your email address:
FROM
node:8-alpine
ENV
WIKI_ADMIN_EMAIL admin@example.com
LABEL
maintainer "requarks.io"
RUN
apk update
&&
\
apk add bash curl git python make g++
--no-cache
&&
\
mkdir
-p
/var/wiki
WORKDIR
/var/wiki
WORKDIR
/var/wiki
COPY
package.json .
RUN
yarn
--silent
# Replace your-config.yml with the path to your config file:
ENV
dockerdev 1
ADD
your-config.yml config.yml
EXPOSE
3000
EXPOSE
3000
ENTRYPOINT
[ "node", "server" ]
CMD
["tail", "-f", "/dev/null"]
dev/docker/config.yml
0 → 100644
View file @
2483dce9
port
:
3000
paths
:
content
:
./content
data
:
./data
db
:
type
:
postgres
host
:
db
port
:
5432
user
:
wikijs
pass
:
wikijsrocks
db
:
wiki
redis
:
host
:
redis
port
:
6379
db
:
0
logLevel
:
info
dev/examples/Dockerfile
0 → 100644
View file @
2483dce9
FROM
requarks/wiki:latest
# Replace with your email address:
ENV
WIKI_ADMIN_EMAIL admin@example.com
WORKDIR
/var/wiki
# Replace your-config.yml with the path to your config file:
ADD
your-config.yml config.yml
EXPOSE
3000
ENTRYPOINT
[ "node", "server" ]
dev/
docker
/docker-compose.yml
→
dev/
examples
/docker-compose.yml
View file @
2483dce9
File moved
docker-compose.yml
0 → 100644
View file @
2483dce9
# -- DEV DOCKER-COMPOSE --
# -- DO NOT USE IN PRODUCTION! --
version
:
"
3"
services
:
redis
:
image
:
redis:4-alpine
ports
:
-
"
16379:6379"
logging
:
driver
:
"
none"
networks
:
-
wikinet
db
:
image
:
postgres:9-alpine
environment
:
POSTGRES_DB
:
wiki
POSTGRES_PASSWORD
:
wikijsrocks
POSTGRES_USER
:
wikijs
logging
:
driver
:
"
none"
volumes
:
-
db-data:/var/lib/postgresql/data
networks
:
-
wikinet
ports
:
-
"
15432:5432"
wiki
:
build
:
context
:
.
dockerfile
:
dev/docker/Dockerfile
depends_on
:
-
db
-
redis
networks
:
-
wikinet
ports
:
-
"
3000:3000"
volumes
:
-
.:/var/wiki
-
/var/wiki/node_modules
networks
:
wikinet
:
volumes
:
db-data
:
server/core/config.js
View file @
2483dce9
...
@@ -18,6 +18,10 @@ module.exports = {
...
@@ -18,6 +18,10 @@ module.exports = {
dataRegex
:
path
.
join
(
WIKI
.
SERVERPATH
,
'app/regex.js'
)
dataRegex
:
path
.
join
(
WIKI
.
SERVERPATH
,
'app/regex.js'
)
}
}
if
(
process
.
env
.
dockerdev
)
{
confPaths
.
config
=
path
.
join
(
WIKI
.
ROOTPATH
,
'dev/docker/config.yml'
)
}
process
.
stdout
.
write
(
chalk
.
blue
(
`Loading configuration from
${
confPaths
.
config
}
... `
))
process
.
stdout
.
write
(
chalk
.
blue
(
`Loading configuration from
${
confPaths
.
config
}
... `
))
let
appconfig
=
{}
let
appconfig
=
{}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment