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
088be3aa
Unverified
Commit
088be3aa
authored
3 years ago
by
Erik Michelson
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Remove sequelize from entrypoint script and Dockerfile
Signed-off-by:
Erik Michelson
<
github@erik.michelson.eu
>
parent
46ee3148
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 @
088be3aa
...
@@ -44,7 +44,7 @@ COPY --from=dockerize dockerize /usr/local/bin/
...
@@ -44,7 +44,7 @@ COPY --from=dockerize dockerize /usr/local/bin/
COPY
--chown=$UID --from=builder /hedgedoc /hedgedoc
COPY
--chown=$UID --from=builder /hedgedoc /hedgedoc
# Add configuraton files
# Add configuraton files
COPY
["resources/config.json", "
resources/.sequelizerc", "
/files/"]
COPY
["resources/config.json", "/files/"]
# For backwards compatibility
# For backwards compatibility
RUN
ln
-s
/hedgedoc /codimd
RUN
ln
-s
/hedgedoc /codimd
...
@@ -55,8 +55,6 @@ RUN apk add --no-cache --no-progress --repository http://dl-cdn.alpinelinux.org/
...
@@ -55,8 +55,6 @@ RUN apk add --no-cache --no-progress --repository http://dl-cdn.alpinelinux.org/
# Symlink configuration files
# Symlink configuration files
RUN
rm
-f
/hedgedoc/config.json
RUN
rm
-f
/hedgedoc/config.json
RUN
ln
-s
/files/config.json /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
# Create hedgedoc user
RUN
adduser
-u
$UID
-h
/hedgedoc/
-D
-S
hedgedoc
RUN
adduser
-u
$UID
-h
/hedgedoc/
-D
-S
hedgedoc
...
...
This diff is collapsed.
Click to expand it.
debian/Dockerfile
View file @
088be3aa
...
@@ -50,7 +50,7 @@ COPY --from=dockerize dockerize /usr/local/bin/
...
@@ -50,7 +50,7 @@ COPY --from=dockerize dockerize /usr/local/bin/
COPY
--chown=$UID --from=builder /hedgedoc /hedgedoc
COPY
--chown=$UID --from=builder /hedgedoc /hedgedoc
# Add configuraton files
# Add configuraton files
COPY
["resources/config.json", "
resources/.sequelizerc", "
/files/"]
COPY
["resources/config.json", "/files/"]
# For backwards compatibility
# For backwards compatibility
RUN
ln
-s
/hedgedoc /codimd
RUN
ln
-s
/hedgedoc /codimd
...
@@ -58,8 +58,6 @@ RUN ln -s /hedgedoc /codimd
...
@@ -58,8 +58,6 @@ RUN ln -s /hedgedoc /codimd
# Symlink configuration files
# Symlink configuration files
RUN
rm
-f
/hedgedoc/config.json
RUN
rm
-f
/hedgedoc/config.json
RUN
ln
-s
/files/config.json /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
# Create hedgedoc user
RUN
adduser
--uid
$UID
--home
/hedgedoc/
--disabled-password
--system
hedgedoc
RUN
adduser
--uid
$UID
--home
/hedgedoc/
--disabled-password
--system
hedgedoc
...
...
This diff is collapsed.
Click to expand it.
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
}
This diff is collapsed.
Click to expand it.
resources/docker-entrypoint.sh
View file @
088be3aa
...
@@ -30,8 +30,6 @@ if [ "$DB_SOCKET" != "" ]; then
...
@@ -30,8 +30,6 @@ if [ "$DB_SOCKET" != "" ]; then
dockerize
-wait
"tcp://
${
DB_SOCKET
}
"
-timeout
30s
dockerize
-wait
"tcp://
${
DB_SOCKET
}
"
-timeout
30s
fi
fi
$GOSU
./node_modules/.bin/sequelize db:migrate
# Print warning if local data storage is used but no volume is mounted
# Print warning if local data storage is used but no volume is mounted
[
"
$CMD_IMAGE_UPLOAD_TYPE
"
=
"filesystem"
]
&&
{
mountpoint
-q
./public/uploads
||
{
[
"
$CMD_IMAGE_UPLOAD_TYPE
"
=
"filesystem"
]
&&
{
mountpoint
-q
./public/uploads
||
{
echo
"
echo
"
...
...
This diff is collapsed.
Click to expand it.
tests/version.sh
View file @
088be3aa
...
@@ -14,7 +14,7 @@ fi
...
@@ -14,7 +14,7 @@ fi
# Check for command existence
# Check for command existence
# See: https://www.shivering-isles.com/helpful-shell-snippets-for-docker-testing-and-bootstrapping/
# 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
# Docker latest version tag
# See: https://www.shivering-isles.com/helpful-shell-snippets-for-docker-testing-and-bootstrapping/
# 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"; }
...
@@ -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/
# 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"
;
}
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
"
`
)
LATEST
=
$(
docker_image_latest_tag
`
docker_base_name
"
$DOCKERFILE
"
`
)
CURRENT
=
$(
docker_base_version
"
$DOCKERFILE
"
)
CURRENT
=
$(
docker_base_version
"
$DOCKERFILE
"
)
...
...
This diff is collapsed.
Click to expand it.
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