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
123b0e15
Unverified
Commit
123b0e15
authored
May 28, 2023
by
NGPixel
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
ci: fix Dockerfile + quasar build context
parent
305854f8
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
17 additions
and
10 deletions
+17
-10
Dockerfile
dev/build/Dockerfile
+12
-5
quasar.config.js
ux/quasar.config.js
+5
-5
No files found.
dev/build/Dockerfile
View file @
123b0e15
# ====================
# --- Build Assets ---
# ====================
FROM
node:
18
AS assets
FROM
node:
20
AS assets
RUN
apt-get update
&&
apt-get
install
build-essential
-y
RUN
apt-get update
&&
apt-get
install
-qy
build-essential
WORKDIR
/wiki
...
...
@@ -17,11 +17,18 @@ RUN cd ux && \
# ===============
# --- Release ---
# ===============
FROM
node:
18-alpine
FROM
node:
20
LABEL
maintainer="requarks.io"
RUN
apk add bash curl git openssh gnupg
--no-cache
&&
\
mkdir
-p
/wiki
&&
\
RUN
apt-get update
&&
apt-get
install
-qy
--no-install-recommends
\
bash
\
curl
\
git
\
gnupg
\
openssh-client
\
pandoc
\
&&
rm
-rf
/var/lib/apt/lists/
*
RUN
mkdir
-p
/wiki
&&
\
mkdir
-p
/logs
&&
\
mkdir
-p
/wiki/data/content
&&
\
chown
-R
node:node /wiki /logs
...
...
ux/quasar.config.js
View file @
123b0e15
...
...
@@ -13,11 +13,11 @@ const path = require('path')
const
yaml
=
require
(
'js-yaml'
)
const
fs
=
require
(
'fs'
)
module
.
exports
=
configure
(
function
(
/* ctx */
)
{
const
userConfig
=
{
module
.
exports
=
configure
(
function
(
ctx
)
{
const
userConfig
=
ctx
.
dev
?
{
dev
:
{
port
:
3001
,
hmrClientPort
:
3001
},
...
yaml
.
load
(
fs
.
readFileSync
(
path
.
resolve
(
__dirname
,
'../config.yml'
),
'utf8'
))
}
}
:
{}
return
{
eslint
:
{
...
...
@@ -123,7 +123,7 @@ module.exports = configure(function (/* ctx */) {
devServer
:
{
// https: true
open
:
false
,
// opens browser window automatically
port
:
userConfig
.
dev
.
port
,
port
:
userConfig
.
dev
?
.
port
,
proxy
:
{
'/_graphql'
:
`http://127.0.0.1:
${
userConfig
.
port
}
/_graphql`
,
'/_site'
:
`http://127.0.0.1:
${
userConfig
.
port
}
`
,
...
...
@@ -131,7 +131,7 @@ module.exports = configure(function (/* ctx */) {
'/_user'
:
`http://127.0.0.1:
${
userConfig
.
port
}
`
},
hmr
:
{
clientPort
:
userConfig
.
dev
.
hmrClientPort
clientPort
:
userConfig
.
dev
?
.
hmrClientPort
},
vueDevtools
:
true
},
...
...
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