Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
Container
Manage
Activity
Members
Code
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Deploy
Releases
Model registry
Analyze
Contributor analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
GitLab community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
HedgeDoc
Container
Commits
abf4a507
Unverified
Commit
abf4a507
authored
5 years ago
by
Sandro Jäckel
Browse files
Options
Downloads
Patches
Plain Diff
Fix empty continuation lines
Closes #11
parent
6e445349
Branches
Branches containing commit
No related tags found
No related merge requests found
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
alpine/Dockerfile
+4
-4
4 additions, 4 deletions
alpine/Dockerfile
debian/Dockerfile
+9
-9
9 additions, 9 deletions
debian/Dockerfile
with
13 additions
and
13 deletions
alpine/Dockerfile
+
4
−
4
View file @
abf4a507
...
...
@@ -72,24 +72,24 @@ RUN apk add --no-cache --virtual .dep \
mv /tmp/gitref /codimd/.git/HEAD && \
jq ".repository.url = \"${CODIMD_REPOSITORY}\"" /codimd/package.json > /codimd/package.new.json && \
mv /codimd/package.new.json /codimd/package.json && \
\
# Symlink configuration files
rm -f /codimd/config.json && \
ln -s /files/config.json /codimd/config.json && \
rm -f /codimd/.sequelizerc && \
ln -s /files/.sequelizerc /codimd/.sequelizerc && \
\
# Install NPM dependencies and build project
yarn install --pure-lockfile && \
yarn install --production=false --pure-lockfile && \
#yarn global add webpack && \
npm run build && \
\
# Clean up this layer
yarn install && \
yarn cache clean && \
apk del .dep && \
\
adduser -u $UID -h /codimd/ -D -S codimd && \
chown -R codimd /codimd/
...
...
This diff is collapsed.
Click to expand it.
debian/Dockerfile
+
9
−
9
View file @
abf4a507
...
...
@@ -30,13 +30,13 @@ RUN set -ex; \
dpkgArch
=
"
$(
dpkg
--print-architecture
|
awk
-F-
'{ print $NF }'
)
"
;
\
wget
-O
/usr/local/bin/gosu
"https://github.com/tianon/gosu/releases/download/
$GOSU_VERSION
/gosu-
$dpkgArch
"
;
\
wget
-O
/usr/local/bin/gosu.asc
"https://github.com/tianon/gosu/releases/download/
$GOSU_VERSION
/gosu-
$dpkgArch
.asc"
;
\
\
# verify the signature
export GNUPGHOME="$(mktemp -d)"; \
gpg --no-tty --import /tmp/gosu.key; \
gpg --batch --verify /usr/local/bin/gosu.asc /usr/local/bin/gosu; \
rm -rf "$GNUPGHOME" /usr/local/bin/gosu.asc; \
\
chmod +x /usr/local/bin/gosu; \
# verify that the binary works
gosu nobody true && \
...
...
@@ -57,7 +57,7 @@ RUN export dev_apt=( \
"
${
dev_apt
[@]
}
"
\
# Add fonts for PDF export
fonts-noto && \
\
# Clone the source
git clone --depth 1 --branch "$VERSION" "$CODIMD_REPOSITORY" /codimd && \
# Print the cloned version and clean up git files
...
...
@@ -65,24 +65,24 @@ RUN export dev_apt=( \
git log --pretty=format:'%ad %h %d' --abbrev-commit --date=short -1 && echo && \
git rev-parse HEAD > /tmp/gitref && \
rm -rf /codimd/.git && \
\
# Mime the git repository for fullversion
mkdir /codimd/.git && \
mv /tmp/gitref /codimd/.git/HEAD && \
jq ".repository.url = \"${CODIMD_REPOSITORY}\"" /codimd/package.json > /codimd/package.new.json && \
mv /codimd/package.new.json /codimd/package.json && \
\
# Symlink configuration files
rm -f /codimd/config.json && \
ln -s /files/config.json /codimd/config.json && \
rm -f /codimd/.sequelizerc && \
ln -s /files/.sequelizerc /codimd/.sequelizerc && \
\
# Install NPM dependencies and build project
yarn install --pure-lockfile && \
yarn install --production=false --pure-lockfile && \
npm run build && \
\
# Clean up this layer
yarn install && \
yarn cache clean && \
...
...
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