Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
D
Dockerfiles
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Container Registry
Model registry
Operate
Environments
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
This is an archived project. Repository and other project resources are read-only.
Show more breadcrumbs
Picasoft
Technique
Dockerfiles
Commits
a963fea9
Verified
Commit
a963fea9
authored
4 years ago
by
Roma
Browse files
Options
Downloads
Patches
Plain Diff
moved ABIWORD env from d-c.yml to dockerfile
parent
437c12b1
No related branches found
No related tags found
1 merge request
!57
Delete pad after delay
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
pica-etherpad/Dockerfile
+1
-0
1 addition, 0 deletions
pica-etherpad/Dockerfile
pica-etherpad/docker-compose.yml
+0
-2
0 additions, 2 deletions
pica-etherpad/docker-compose.yml
with
1 addition
and
2 deletions
pica-etherpad/Dockerfile
+
1
−
0
View file @
a963fea9
...
...
@@ -104,4 +104,5 @@ USER etherpad
EXPOSE
8080
HEALTHCHECK
--interval=20s --timeout=3s CMD curl --fail http://localhost:8080 || exit 1
WORKDIR
/opt/etherpad-lite/
ENV
ABIWORD "/usr/bin/abiword" #installed here by debian
ENTRYPOINT
["/opt/etherpad-lite/entrypoint.sh", "/opt/etherpad-lite/bin/run.sh" ]
This diff is collapsed.
Click to expand it.
pica-etherpad/docker-compose.yml
+
0
−
2
View file @
a963fea9
...
...
@@ -84,7 +84,6 @@ services:
THEME
:
"
colibris"
TITLE
:
"
Picapad"
TRUST_PROXY
:
"
true"
ABIWORD
:
"
/usr/bin/abiword"
networks
:
-
proxy
-
standard_app-db
...
...
@@ -116,7 +115,6 @@ services:
THEME
:
"
colibris"
TITLE
:
"
Picapad
Hebdo"
TRUST_PROXY
:
"
true"
ABIWORD
:
"
/usr/bin/abiword"
depends_on
:
-
week_db
networks
:
...
...
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