Loading .env.dev +4 −1 Original line number Diff line number Diff line Loading @@ -3,3 +3,6 @@ BIND_IP=127.0.0.1 BIND_PORT=80 IMAGE_TAG=master SERVER_IMAGE_TAG=master COMPOSE_PROJECT_NAME=user_docs ES_MIN_RAM=4g ES_MAX_RAM=4g .gitlab-ci.yml +0 −3 Original line number Diff line number Diff line Loading @@ -36,9 +36,6 @@ default: - docker build --pull -t "$CI_REGISTRY_IMAGE/jekyll:$IMAGE_TAG" -f Dockerfile.jekyll htdocs - docker push "$CI_REGISTRY_IMAGE/jekyll:$IMAGE_TAG" - docker build --pull -t "$CI_REGISTRY_IMAGE/ubuntu:$IMAGE_TAG" -f Dockerfile.ubuntu htdocs - docker push "$CI_REGISTRY_IMAGE/ubuntu:$IMAGE_TAG" - docker build --pull -t "$CI_REGISTRY_IMAGE/nginx:$IMAGE_TAG" -f Dockerfile.nginx htdocs - docker push "$CI_REGISTRY_IMAGE/nginx:$IMAGE_TAG" Loading Dockerfile +2 −2 Original line number Diff line number Diff line Loading @@ -5,9 +5,9 @@ COPY . /tmp RUN date > /tmp/build_date RUN jekyll build -d /tmp/e_docs_website && rm /tmp/Gemfile* FROM registry.gitlab.e.foundation:5000/e/documentation/user/ubuntu:$IMAGE_TAG AS ubuntu FROM ubuntu:22.04 AS ubuntu COPY --from=jekyll /tmp/e_docs_website/ /tmp/e_docs_website/ RUN apt-get update && apt-get install minify -y RUN minify -r -o /tmp/e_docs_website/ /tmp/e_docs_website/ FROM registry.gitlab.e.foundation:5000/e/documentation/user/nginx:$IMAGE_TAG Loading Dockerfile.jekyll +1 −1 Original line number Diff line number Diff line FROM jekyll/jekyll:4.2.0 AS jekyll FROM jekyll/jekyll:stable AS jekyll WORKDIR /tmp COPY --chown=jekyll:jekyll Gemfile Gemfile.lock /tmp/ Loading Dockerfile.nginx +1 −1 Original line number Diff line number Diff line FROM nginx:1.20 FROM nginx:stable LABEL maintainer="dev@murena.io" RUN apt-get -y update RUN apt-get -y install rsync Loading Loading
.env.dev +4 −1 Original line number Diff line number Diff line Loading @@ -3,3 +3,6 @@ BIND_IP=127.0.0.1 BIND_PORT=80 IMAGE_TAG=master SERVER_IMAGE_TAG=master COMPOSE_PROJECT_NAME=user_docs ES_MIN_RAM=4g ES_MAX_RAM=4g
.gitlab-ci.yml +0 −3 Original line number Diff line number Diff line Loading @@ -36,9 +36,6 @@ default: - docker build --pull -t "$CI_REGISTRY_IMAGE/jekyll:$IMAGE_TAG" -f Dockerfile.jekyll htdocs - docker push "$CI_REGISTRY_IMAGE/jekyll:$IMAGE_TAG" - docker build --pull -t "$CI_REGISTRY_IMAGE/ubuntu:$IMAGE_TAG" -f Dockerfile.ubuntu htdocs - docker push "$CI_REGISTRY_IMAGE/ubuntu:$IMAGE_TAG" - docker build --pull -t "$CI_REGISTRY_IMAGE/nginx:$IMAGE_TAG" -f Dockerfile.nginx htdocs - docker push "$CI_REGISTRY_IMAGE/nginx:$IMAGE_TAG" Loading
Dockerfile +2 −2 Original line number Diff line number Diff line Loading @@ -5,9 +5,9 @@ COPY . /tmp RUN date > /tmp/build_date RUN jekyll build -d /tmp/e_docs_website && rm /tmp/Gemfile* FROM registry.gitlab.e.foundation:5000/e/documentation/user/ubuntu:$IMAGE_TAG AS ubuntu FROM ubuntu:22.04 AS ubuntu COPY --from=jekyll /tmp/e_docs_website/ /tmp/e_docs_website/ RUN apt-get update && apt-get install minify -y RUN minify -r -o /tmp/e_docs_website/ /tmp/e_docs_website/ FROM registry.gitlab.e.foundation:5000/e/documentation/user/nginx:$IMAGE_TAG Loading
Dockerfile.jekyll +1 −1 Original line number Diff line number Diff line FROM jekyll/jekyll:4.2.0 AS jekyll FROM jekyll/jekyll:stable AS jekyll WORKDIR /tmp COPY --chown=jekyll:jekyll Gemfile Gemfile.lock /tmp/ Loading
Dockerfile.nginx +1 −1 Original line number Diff line number Diff line FROM nginx:1.20 FROM nginx:stable LABEL maintainer="dev@murena.io" RUN apt-get -y update RUN apt-get -y install rsync Loading