A partir del 1 de octubre vamos a activar 2FA a todas las cuentas de esta instancia de Gitlab. No obstante, se recomienda activarlo cuanto antes para garantizar la seguridad de vuestra cuenta. Podeis hacerlo siguiendo las indicaciones del enlace.

As of October 1, we are going to enable 2FA to all accounts in this Gitlab instance. However, it is recommended to enable it as soon as possible to guarantee the security of your account. You can do it by following the instructions in the link.


Commit a18e72d0 authored by Prada Sarasola, Miguel's avatar Prada Sarasola, Miguel
Browse files

Relax Docker test severity and fix remaining issues

parent 2a9be8d5
Pipeline #12802 passed with stage
in 50 seconds
...@@ -3,12 +3,19 @@ shellcheck: ...@@ -3,12 +3,19 @@ shellcheck:
script: 'shellcheck deploy/base/ros_entrypoint.bash scripts/*sh' script: 'shellcheck deploy/base/ros_entrypoint.bash scripts/*sh'
allow_failure: yes 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: dockerfiles:
image: hadolint/hadolint:latest-debian image: hadolint/hadolint:latest-debian
script: script:
- RET=0 - RET=0
- hadolint deploy/base/Dockerfile || RET=1 - hadolint --ignore DL3006 --ignore DL3008 deploy/base/Dockerfile || RET=1
- hadolint deploy/dev/Dockerfile || RET=1 - hadolint --ignore DL3006 --ignore DL3008 deploy/dev/Dockerfile || RET=1
- exit $RET - exit $RET
allow_failure: yes allow_failure: yes
...@@ -2,7 +2,7 @@ FROM industrial_ci_image ...@@ -2,7 +2,7 @@ FROM industrial_ci_image
RUN rm -rf /root/ici /root/src 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 \ ros-kinetic-rosbash \
&& rm -rf /var/lib/apt/lists/* && rm -rf /var/lib/apt/lists/*
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 \ apt-transport-https \
curl \ 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 \ RUN curl https://packages.microsoft.com/keys/microsoft.asc | gpg --dearmor > microsoft.gpg \
&& mv microsoft.gpg /etc/apt/trusted.gpg.d/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' && 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 \ RUN apt-get update -qq && apt-get install -y -qq --no-install-recommends \
code code \
&& rm -rf /var/lib/apt/lists/*
RUN echo "alias code='code --user-data-dir /root'" >> /root/.bashrc RUN echo "alias code='code --user-data-dir /root'" >> /root/.bashrc
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment