diff options
| author | Evan Read <eread@gitlab.com> | 2022-05-12 08:28:03 +0300 |
|---|---|---|
| committer | Evan Read <eread@gitlab.com> | 2022-05-12 08:28:03 +0300 |
| commit | 520363ae2ff5b1bc4d306150cb2a51daa8d02dfd (patch) | |
| tree | cefe96d8626f9db42292497700b15264fa27da72 /dockerfiles | |
| parent | 06d92290bd3d0df2f81fac129e89daf748796b96 (diff) | |
Avoid disabling hadolint rule DL3025
Diffstat (limited to 'dockerfiles')
| -rw-r--r-- | dockerfiles/archives.Dockerfile | 3 | ||||
| -rw-r--r-- | dockerfiles/nginx.onbuild.Dockerfile | 3 |
2 files changed, 2 insertions, 4 deletions
diff --git a/dockerfiles/archives.Dockerfile b/dockerfiles/archives.Dockerfile index 961d0cfd..d2e8eeb2 100644 --- a/dockerfiles/archives.Dockerfile +++ b/dockerfiles/archives.Dockerfile @@ -49,5 +49,4 @@ COPY --from=registry.gitlab.com/gitlab-org/gitlab-docs:10.4 ${TARGET} ${TARGET} COPY --from=registry.gitlab.com/gitlab-org/gitlab-docs:10.3 ${TARGET} ${TARGET} # Serve the site (target), which is now all static HTML -# hadolint ignore=DL3025 -CMD echo -e "GitLab docs are viewable at:\nhttp://0.0.0.0:4000"; exec nginx -g 'daemon off;' +CMD ["sh", "-c", "echo 'GitLab docs are viewable at: http://0.0.0.0:4000'; exec nginx -g 'daemon off;'"] diff --git a/dockerfiles/nginx.onbuild.Dockerfile b/dockerfiles/nginx.onbuild.Dockerfile index 585f67c4..d785efff 100644 --- a/dockerfiles/nginx.onbuild.Dockerfile +++ b/dockerfiles/nginx.onbuild.Dockerfile @@ -18,5 +18,4 @@ ONBUILD COPY --from=builder /site /usr/share/nginx/html COPY dockerfiles/nginx-overrides.conf /etc/nginx/conf.d/default.conf # Start Nginx to serve the archive at / (which will redirect to the version-specific dir) -# hadolint ignore=DL3025 -CMD echo -e "GitLab docs are viewable at:\nhttp://0.0.0.0:4000"; exec nginx -g 'daemon off;' +CMD ["sh", "-c", "echo 'GitLab docs are viewable at: http://0.0.0.0:4000'; exec nginx -g 'daemon off;'"] |