Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
W
writeFrame
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
gargantext
writeFrame
Commits
6b294a15
Unverified
Commit
6b294a15
authored
May 04, 2021
by
David Mehren
Committed by
GitHub
May 04, 2021
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #177 from hedgedoc/remove-sequelize
Remove sequelize from entrypoint script and Dockerfile
parents
46ee3148
088be3aa
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
4 additions
and
18 deletions
+4
-18
Dockerfile
alpine/Dockerfile
+1
-3
Dockerfile
debian/Dockerfile
+1
-3
.sequelizerc
resources/.sequelizerc
+0
-8
docker-entrypoint.sh
resources/docker-entrypoint.sh
+0
-2
version.sh
tests/version.sh
+2
-2
No files found.
alpine/Dockerfile
View file @
6b294a15
...
...
@@ -44,7 +44,7 @@ COPY --from=dockerize dockerize /usr/local/bin/
COPY
--chown=$UID --from=builder /hedgedoc /hedgedoc
# Add configuraton files
COPY
["resources/config.json", "
resources/.sequelizerc", "
/files/"]
COPY
["resources/config.json", "/files/"]
# For backwards compatibility
RUN
ln
-s
/hedgedoc /codimd
...
...
@@ -55,8 +55,6 @@ RUN apk add --no-cache --no-progress --repository http://dl-cdn.alpinelinux.org/
# Symlink configuration files
RUN
rm
-f
/hedgedoc/config.json
RUN
ln
-s
/files/config.json /hedgedoc/config.json
RUN
rm
-f
/hedgedoc/.sequelizerc
RUN
ln
-s
/files/.sequelizerc /hedgedoc/.sequelizerc
# Create hedgedoc user
RUN
adduser
-u
$UID
-h
/hedgedoc/
-D
-S
hedgedoc
...
...
debian/Dockerfile
View file @
6b294a15
...
...
@@ -50,7 +50,7 @@ COPY --from=dockerize dockerize /usr/local/bin/
COPY
--chown=$UID --from=builder /hedgedoc /hedgedoc
# Add configuraton files
COPY
["resources/config.json", "
resources/.sequelizerc", "
/files/"]
COPY
["resources/config.json", "/files/"]
# For backwards compatibility
RUN
ln
-s
/hedgedoc /codimd
...
...
@@ -58,8 +58,6 @@ RUN ln -s /hedgedoc /codimd
# Symlink configuration files
RUN
rm
-f
/hedgedoc/config.json
RUN
ln
-s
/files/config.json /hedgedoc/config.json
RUN
rm
-f
/hedgedoc/.sequelizerc
RUN
ln
-s
/files/.sequelizerc /hedgedoc/.sequelizerc
# Create hedgedoc user
RUN
adduser
--uid
$UID
--home
/hedgedoc/
--disabled-password
--system
hedgedoc
...
...
resources/.sequelizerc
deleted
100644 → 0
View file @
46ee3148
var path = require('path');
module.exports = {
'config': path.resolve('config.json'),
'migrations-path': path.resolve('lib', 'migrations'),
'models-path': path.resolve('lib', 'models'),
'url': process.env.CMD_DB_URL
}
resources/docker-entrypoint.sh
View file @
6b294a15
...
...
@@ -30,8 +30,6 @@ if [ "$DB_SOCKET" != "" ]; then
dockerize
-wait
"tcp://
${
DB_SOCKET
}
"
-timeout
30s
fi
$GOSU
./node_modules/.bin/sequelize db:migrate
# Print warning if local data storage is used but no volume is mounted
[
"
$CMD_IMAGE_UPLOAD_TYPE
"
=
"filesystem"
]
&&
{
mountpoint
-q
./public/uploads
||
{
echo
"
...
...
tests/version.sh
View file @
6b294a15
...
...
@@ -14,7 +14,7 @@ fi
# Check for command existence
# See: https://www.shivering-isles.com/helpful-shell-snippets-for-docker-testing-and-bootstrapping/
command_exits
()
{
command
-v
$1
>
/dev/null 2>&1
||
{
echo
>
&2
"I require
$1
but it's not installed. Aborting."
;
exit
1
;
}
;
}
command_exi
s
ts
()
{
command
-v
$1
>
/dev/null 2>&1
||
{
echo
>
&2
"I require
$1
but it's not installed. Aborting."
;
exit
1
;
}
;
}
# Docker latest version tag
# See: https://www.shivering-isles.com/helpful-shell-snippets-for-docker-testing-and-bootstrapping/
...
...
@@ -32,7 +32,7 @@ docker_base_version() { cat "$1" | grep FROM | sed -e "s/FROM.*://g"; }
# See: https://www.shivering-isles.com/helpful-shell-snippets-for-docker-testing-and-bootstrapping/
docker_base_name
()
{
cat
"
$1
"
|
grep
FROM |
sed
-e
"s/FROM[^[:alpha:]]//g"
-e
"s/:.*//g"
;
}
command_exits wget
command_exi
s
ts wget
LATEST
=
$(
docker_image_latest_tag
`
docker_base_name
"
$DOCKERFILE
"
`
)
CURRENT
=
$(
docker_base_version
"
$DOCKERFILE
"
)
...
...
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