Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d153c837 authored by Ronak Patel's avatar Ronak Patel
Browse files

Merge branch 'master' into 'add-verified-boot-section' 

# Conflicts:
#   htdocs/_data/devices/bacon.yml
parents 2cb5b4fc 96027f25

.env.dev

+4 −1
Original line number Diff line number Diff line
@@ -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 −10
Original line number Diff line number Diff line
@@ -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"
@@ -49,8 +46,6 @@ deep-build:branch: 
      when: never

    - if: '$CI_PIPELINE_SOURCE == "merge_request_event"'

      when: never

    - if: '$CI_PIPELINE_SOURCE =~ /schedule|web|api|trigger/ && $IMAGE_TAG != $CI_COMMIT_REF_SLUG'

      when: never

    - if: '$CI_COMMIT_BRANCH == "master"'

      when: manual

    - when: always
@@ -89,11 +84,6 @@ nginx_container_scanner: 
  variables:

    DOCKER_IMAGE: $CI_REGISTRY_IMAGE/nginx:$CI_COMMIT_REF_SLUG



ubuntu_container_scanner:

  extends: container_scanning

  variables:

    DOCKER_IMAGE: $CI_REGISTRY_IMAGE/ubuntu:$CI_COMMIT_REF_SLUG



# Deploy stage

.deploy:compose:

  stage: deploy

Dockerfile

+8 −7
Original line number Diff line number Diff line 
ARG IMAGE_TAG=master

FROM registry.gitlab.e.foundation:5000/e/documentation/user/jekyll:$IMAGE_TAG AS jekyll

FROM registry.gitlab.e.foundation/e/documentation/user/jekyll:$IMAGE_TAG AS jekyll



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

# Fixme: Minify is generating unexpected output, and not even working in prod currently

#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/



COPY --from=jekyll /tmp/e_docs_website/ /tmp/e_docs_website/

RUN minify -r -o /tmp/e_docs_website/ /tmp/e_docs_website/



FROM registry.gitlab.e.foundation:5000/e/documentation/user/nginx:$IMAGE_TAG

COPY --chown=www-data:www-data --from=ubuntu /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 −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/

Dockerfile.nginx

+2 −2
Original line number Diff line number Diff line 
FROM nginx:1.20

LABEL maintainer="dev@e.email"

FROM nginx:stable

LABEL maintainer="dev@murena.io"

RUN apt-get -y update

RUN apt-get -y install rsync