Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
T
templates
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Model registry
Operate
Environments
Monitor
Incidents
Service Desk
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
Terms and privacy
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
tecnalia_robotics-public
templates
Commits
a18e72d0
Commit
a18e72d0
authored
5 years ago
by
Prada Sarasola, Miguel
Browse files
Options
Downloads
Patches
Plain Diff
Relax Docker test severity and fix remaining issues
parent
2a9be8d5
No related branches found
Branches containing commit
No related tags found
1 merge request
!25
Tests
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
.gitlab-ci.yml
+9
-2
9 additions, 2 deletions
.gitlab-ci.yml
deploy/base/Dockerfile
+1
-1
1 addition, 1 deletion
deploy/base/Dockerfile
deploy/dev/Dockerfile
+7
-4
7 additions, 4 deletions
deploy/dev/Dockerfile
with
17 additions
and
7 deletions
.gitlab-ci.yml
+
9
−
2
View file @
a18e72d0
...
...
@@ -3,12 +3,19 @@ shellcheck:
script
:
'
shellcheck
deploy/base/ros_entrypoint.bash
scripts/*sh'
allow_failure
:
yes
# The ignored rules in hadolint checks are
# DL3006 Always tag the version of an image explicitly
# One of the Dockerfiles uses a temporary image which isn't important to tag
# and the other uses a tagged image through an ARG, which apparently is not
# properly recognized.
# DL3008 Pin versions in apt-get install
# A bit overkill
dockerfiles
:
image
:
hadolint/hadolint:latest-debian
script
:
-
RET=0
-
hadolint deploy/base/Dockerfile || RET=1
-
hadolint deploy/dev/Dockerfile || RET=1
-
hadolint
--ignore DL3006 --ignore DL3008
deploy/base/Dockerfile || RET=1
-
hadolint
--ignore DL3006 --ignore DL3008
deploy/dev/Dockerfile || RET=1
-
exit $RET
allow_failure
:
yes
...
...
This diff is collapsed.
Click to expand it.
deploy/base/Dockerfile
+
1
−
1
View file @
a18e72d0
...
...
@@ -2,7 +2,7 @@ FROM industrial_ci_image
RUN
rm
-rf
/root/ici /root/src
RUN
apt-get update
-qq
&&
apt-get
install
-y
-qq
\
RUN
apt-get update
-qq
&&
apt-get
install
-y
-qq
--no-install-recommends
\
ros-kinetic-rosbash
\
&&
rm
-rf
/var/lib/apt/lists/
*
...
...
This diff is collapsed.
Click to expand it.
deploy/dev/Dockerfile
+
7
−
4
View file @
a18e72d0
ARG
APPLICATION_IMAGE
FROM
${APPLICATION_IMAGE}
RUN
apt-get update
-qq
&&
apt-get
install
-y
-qq
\
RUN
apt-get update
-qq
&&
apt-get
install
-y
-qq
--no-install-recommends
\
apt-transport-https
\
curl
\
libasound2
libasound2
\
&&
rm
-rf
/var/lib/apt/lists/
*
SHELL
["/bin/bash", "-o", "pipefail", "-c"]
RUN
curl https://packages.microsoft.com/keys/microsoft.asc | gpg
--dearmor
>
microsoft.gpg
\
&&
mv
microsoft.gpg /etc/apt/trusted.gpg.d/microsoft.gpg
\
&&
sh
-c
'echo "deb [arch=amd64] https://packages.microsoft.com/repos/vscode stable main" > /etc/apt/sources.list.d/vscode.list'
RUN
apt-get update
-qq
&&
apt-get
install
-y
-qq
\
code
RUN
apt-get update
-qq
&&
apt-get
install
-y
-qq
--no-install-recommends
\
code
\
&&
rm
-rf
/var/lib/apt/lists/
*
RUN
echo
"alias code='code --user-data-dir /root'"
>>
/root/.bashrc
...
...
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