Loading .gitlab-ci.yml +9 −0 Original line number Diff line number Diff line Loading @@ -3,6 +3,7 @@ variables: DOCKER_DRIVER: overlay2 stages: - lint - deep-build - build - scan Loading @@ -10,6 +11,14 @@ stages: default: image: docker:20.10 lint:dockerfile: stage: lint tags: - generic_privileged image: hadolint/hadolint:latest-debian script: - for file in Dockerfile Dockerfile.jekyll Dockerfile.nginx; do echo "Linting $file"; hadolint "$file"; done # Build stage .build:docker: stage: build Loading Dockerfile +7 −0 Original line number Diff line number Diff line Loading @@ -12,4 +12,11 @@ RUN jekyll build -d /tmp/e_docs_website && rm /tmp/Gemfile* #RUN minify -r -o /tmp/e_docs_website/ /tmp/e_docs_website/ FROM registry.gitlab.e.foundation/e/documentation/user/nginx:$IMAGE_TAG COPY --chown=www-data:www-data --from=jekyll /tmp/e_docs_website/ /tmp/e_docs_website/ Dockerfile.jekyll +1 −2 Original line number Diff line number Diff line Loading @@ -2,5 +2,4 @@ FROM jekyll/jekyll:4 AS jekyll WORKDIR /tmp COPY --chown=jekyll:jekyll Gemfile Gemfile.lock /tmp/ RUN bundle config set --local deployment 'true' \ && bundle install RUN bundle config set --local deployment 'true' && bundle install Dockerfile.nginx +7 −5 Original line number Diff line number Diff line FROM nginx:stable LABEL maintainer="dev@murena.io" RUN apt-get -y update RUN apt-get -y install rsync RUN apt-get update \ && apt-get install -y --no-install-recommends rsync=3.2.7-1+deb12u2 \ && rm -rf /var/lib/apt/lists/* COPY ./config/nginx/nginx.conf /etc/nginx/nginx.conf COPY ./config/nginx/conf.d /etc/nginx/conf.d COPY ./entrypoint.sh ./entrypoint.sh RUN chmod +x entrypoint.sh COPY ./entrypoint.sh /entrypoint.sh RUN chmod +x /entrypoint.sh ENTRYPOINT [ "./entrypoint.sh" ] ENTRYPOINT [ "/entrypoint.sh" ] Loading
.gitlab-ci.yml +9 −0 Original line number Diff line number Diff line Loading @@ -3,6 +3,7 @@ variables: DOCKER_DRIVER: overlay2 stages: - lint - deep-build - build - scan Loading @@ -10,6 +11,14 @@ stages: default: image: docker:20.10 lint:dockerfile: stage: lint tags: - generic_privileged image: hadolint/hadolint:latest-debian script: - for file in Dockerfile Dockerfile.jekyll Dockerfile.nginx; do echo "Linting $file"; hadolint "$file"; done # Build stage .build:docker: stage: build Loading
Dockerfile +7 −0 Original line number Diff line number Diff line Loading @@ -12,4 +12,11 @@ RUN jekyll build -d /tmp/e_docs_website && rm /tmp/Gemfile* #RUN minify -r -o /tmp/e_docs_website/ /tmp/e_docs_website/ FROM registry.gitlab.e.foundation/e/documentation/user/nginx:$IMAGE_TAG COPY --chown=www-data:www-data --from=jekyll /tmp/e_docs_website/ /tmp/e_docs_website/
Dockerfile.jekyll +1 −2 Original line number Diff line number Diff line Loading @@ -2,5 +2,4 @@ FROM jekyll/jekyll:4 AS jekyll WORKDIR /tmp COPY --chown=jekyll:jekyll Gemfile Gemfile.lock /tmp/ RUN bundle config set --local deployment 'true' \ && bundle install RUN bundle config set --local deployment 'true' && bundle install
Dockerfile.nginx +7 −5 Original line number Diff line number Diff line FROM nginx:stable LABEL maintainer="dev@murena.io" RUN apt-get -y update RUN apt-get -y install rsync RUN apt-get update \ && apt-get install -y --no-install-recommends rsync=3.2.7-1+deb12u2 \ && rm -rf /var/lib/apt/lists/* COPY ./config/nginx/nginx.conf /etc/nginx/nginx.conf COPY ./config/nginx/conf.d /etc/nginx/conf.d COPY ./entrypoint.sh ./entrypoint.sh RUN chmod +x entrypoint.sh COPY ./entrypoint.sh /entrypoint.sh RUN chmod +x /entrypoint.sh ENTRYPOINT [ "./entrypoint.sh" ] ENTRYPOINT [ "/entrypoint.sh" ]