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
911006bd
Commit
911006bd
authored
6 years ago
by
Igor Witz
Browse files
Options
Downloads
Patches
Plain Diff
Update .gitlab-ci.yml, pica-dokuwiki/Dockerfile files
parent
9f50dcc6
No related branches found
No related tags found
1 merge request
!22
Ajout de la CI pour Etherpad et Dokuwiki
Pipeline
#31160
canceled
6 years ago
Stage: build
Stage: static_tests
Stage: dynamic_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-dokuwiki/Dockerfile
+1
-1
1 addition, 1 deletion
pica-dokuwiki/Dockerfile
with
2 additions
and
2 deletions
.gitlab-ci.yml
+
1
−
1
View file @
911006bd
...
...
@@ -46,7 +46,7 @@ clair:
-
wget https://github.com/arminc/clair-scanner/releases/download/v8/clair-scanner_linux_amd64
-
mv clair-scanner_linux_amd64 clair-scanner
-
chmod +x clair-scanner
-
echo "Waiting for Clair daemon to start"
-
echo "Waiting for Clair daemon to start"
wget
-
while( ! wget -q -O /dev/null http://docker:6060/v1/namespaces ) ; do sleep 1 ; done
-
./clair-scanner -c http://docker:6060 --ip $(hostname -i) -r clair-report.json -l clair.log -w $MODIFIED_IMAGE/clair-whitelist.yml --threshold="High" $REGISTRY/ci-builds/$CI_COMMIT_SHA
artifacts
:
...
...
This diff is collapsed.
Click to expand it.
pica-dokuwiki/Dockerfile
+
1
−
1
View file @
911006bd
...
...
@@ -30,7 +30,7 @@ RUN apt-get update -y && \
USER
nginx
EXPOSE
80
VOLUME
["/var/www/html"]
HEALTHCHECK
CMD
curl -s
127.0.0.1:${DOKUWIKI_PORT:=80}
HEALTHCHECK
CMD
wget -q -O /dev/null http://
127.0.0.1:${DOKUWIKI_PORT:=80}
/
COPY
nginx.conf /etc/nginx/nginx.conf
...
...
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