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
bbb2d39e
Unverified
Commit
bbb2d39e
authored
4 years ago
by
Quentin Duchemin
Browse files
Options
Downloads
Patches
Plain Diff
[Etherpad] Bump script for deletion and remove deleted pads creation from Etherpad
parent
db678182
No related branches found
No related tags found
1 merge request
!57
Delete pad after delay
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
pica-etherpad/Dockerfile
+1
-5
1 addition, 5 deletions
pica-etherpad/Dockerfile
pica-etherpad/standard/docker-compose.yml
+2
-2
2 additions, 2 deletions
pica-etherpad/standard/docker-compose.yml
pica-etherpad/week/docker-compose.yml
+2
-2
2 additions, 2 deletions
pica-etherpad/week/docker-compose.yml
with
5 additions
and
9 deletions
pica-etherpad/Dockerfile
+
1
−
5
View file @
bbb2d39e
...
...
@@ -72,22 +72,18 @@ ARG UID=5004
RUN
useradd
--uid
${
UID
}
--create-home
etherpad
# Used to avoid very long chown (due to https://github.com/docker/for-linux/issues/388)
USER
etherpad
# Import des fichiers téléchargés dans l'image downloader
COPY
--from=downloader /opt/etherpad-lite /opt/etherpad-lite/
# Install debian packages, as root
USER
root
RUN
apt-get update
&&
\
apt-get
install
-y
curl nano postgresql-client abiword
&&
\
rm
-rf
/var/lib/apt/lists/
*
# Created folder for deleted pads
RUN
mkdir
/opt/etherpad-lite/deleted_pads
&&
\
chown
-R
etherpad:etherpad /opt/etherpad-lite/deleted_pads
# Set etherpad as owner of etherpad (permission for its content was already set in downloader)
RUN
chown
etherpad:etherpad /opt/etherpad-lite
...
...
This diff is collapsed.
Click to expand it.
pica-etherpad/standard/docker-compose.yml
+
2
−
2
View file @
bbb2d39e
...
...
@@ -58,10 +58,10 @@ services:
restart
:
unless-stopped
delete-pad-after-delay
:
image
:
registry.picasoft.net/pica-etherpad-delete-after-delay:picasoft-docker.1.0
image
:
registry.picasoft.net/pica-etherpad-delete-after-delay:picasoft-docker.1.0
.1
container_name
:
etherpad_delete-pad-after-delay
build
:
context
:
https://gitlab.utc.fr/picasoft/projets/delete-pad-after-delay.git#picasoft-docker.1.0
context
:
https://gitlab.utc.fr/picasoft/projets/delete-pad-after-delay.git#picasoft-docker.1.0
.1
volumes
:
-
api-key:/mountedAPIkey:ro
-
deleted-pads:/opt/etherpad-lite/deleted_pads
...
...
This diff is collapsed.
Click to expand it.
pica-etherpad/week/docker-compose.yml
+
2
−
2
View file @
bbb2d39e
...
...
@@ -59,10 +59,10 @@ services:
restart
:
unless-stopped
delete-pad-after-delay
:
image
:
registry.picasoft.net/pica-etherpad-delete-after-delay:picasoft-docker.1.0
image
:
registry.picasoft.net/pica-etherpad-delete-after-delay:picasoft-docker.1.0
.1
container_name
:
etherpad_delete-pad-after-delay
build
:
context
:
https://gitlab.utc.fr/picasoft/projets/delete-pad-after-delay.git#picasoft-docker.1.0
context
:
https://gitlab.utc.fr/picasoft/projets/delete-pad-after-delay.git#picasoft-docker.1.0
.1
volumes
:
-
api-key:/mountedAPIkey:ro
-
deleted-pads:/opt/etherpad-lite/deleted_pads
...
...
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