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
71be6949
Verified
Commit
71be6949
authored
5 years ago
by
Quentin Duchemin
Browse files
Options
Downloads
Patches
Plain Diff
Change sed separator as image names may contain slash
parent
893eaba1
No related branches found
Branches containing commit
No related tags found
1 merge request
!44
Optimize CI and remove deployment steps, add Mattermost and update Etherpad
Pipeline
#51119
failed
5 years ago
Stage: ci-base
Stage: build
Stage: security-tests
Changes
2
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
.gitlab-ci.yml
+1
-1
1 addition, 1 deletion
.gitlab-ci.yml
pica-etherpad/Dockerfile
+1
-0
1 addition, 0 deletions
pica-etherpad/Dockerfile
with
2 additions
and
1 deletion
.gitlab-ci.yml
+
1
−
1
View file @
71be6949
...
...
@@ -127,7 +127,7 @@ docker-bench-security:
<<
:
*pull-modified-image
script
:
# Change the Docker Compose to use the "testing" image, not yet pushed on production registry
-
sed -i -e "s
/
$MODIFIED_IMAGE_FULL
/
$REGISTRY
\
/ci-builds
\
/$MODIFIED_IMAGE:$CI_COMMIT_SHA
/
g" $MODIFIED_IMAGE/docker-compose.yml
-
sed -i -e "s
|
$MODIFIED_IMAGE_FULL
|
$REGISTRY/ci-builds/$MODIFIED_IMAGE:$CI_COMMIT_SHA
|
g" $MODIFIED_IMAGE/docker-compose.yml
# If *.example secrets files exist, remove the .example extension to be able to start the container
# Indeed these file are used in Docker Compose with env_file directive
-
if [[ -d $MODIFIED_IMAGE/secrets ]]; then for i in $MODIFIED_IMAGE/secrets/*.example ; do cp $i $(echo $i| cut -d '.' -f1,2); done; fi;
...
...
This diff is collapsed.
Click to expand it.
pica-etherpad/Dockerfile
+
1
−
0
View file @
71be6949
...
...
@@ -49,6 +49,7 @@ RUN for PLUGIN_NAME in ${ETHERPAD_PLUGINS}; do npm install "${PLUGIN_NAME}"; don
# Construction de l'image finale
FROM
base
# Try to stick to the LDAP UID for etherpad (OU=services)
ARG
UID=5004
COPY
entrypoint.sh /opt/etherpad-lite/entrypoint.sh
...
...
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