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

Commit 33c7cb88 authored by Aayush Gupta's avatar Aayush Gupta
Browse files

Merge branch 'backlog_3718-all-upstreamBrowserRebase' into 'master' 

Upstream Browser and BrowserWebView to Bromite v96.0.4664.54

See merge request e/apps/browser!40
parents 9a6cae86 fb5b5ff1

.gitlab-ci.yml

+2 −1
Original line number Diff line number Diff line
@@ -7,6 +7,7 @@ stages: 


variables:

  CONTAINER_IMAGE: registry.gitlab.e.foundation:5000/$CI_PROJECT_PATH

  GIT_SUBMODULE_STRATEGY: recursive



build-docker:

  image: docker:19-git
@@ -18,7 +19,7 @@ build-docker: 
  services:

    - docker:19-dind

  script:

    - docker login -u gitlab-ci-token -p $CI_JOB_TOKEN registry.gitlab.e.foundation:5000

    - echo "$CI_JOB_TOKEN" | docker login registry.gitlab.e.foundation:5000 -u gitlab-ci-token --password-stdin

    - docker pull $CONTAINER_IMAGE:latest || true

    - docker build --cache-from $CONTAINER_IMAGE:latest --tag $CONTAINER_IMAGE:latest ${CI_PROJECT_DIR}

    - docker push $CONTAINER_IMAGE:latest

.gitmodules

0 → 100644
+3 −0
Original line number Diff line number Diff line 
[submodule "bromite"]

	path = bromite

	url = https://github.com/bromite/bromite/

AUTHORS

deleted100644 → 0
+0 −6
Original line number Diff line number Diff line 


Specific authors for Browser, the /e/ fork of Chromium/Bromite:



© ECORP SAS 2019 - Author: Romain Hunault



Note: original authors are not listed here. Please refer to the source code of the original project and/or the commit history for the complete list of authors.
 
 No newline at end of file

CHANGELOG.md

deleted100644 → 0
+0 −906

File deleted.

Preview size limit exceeded, changes collapsed.

Dockerfile

+31 −0
Original line number Diff line number Diff line
@@ -5,6 +5,14 @@ ENV PATH "$PATH:${DEPOT_TOOLS}" 
ENV CHROMIUM_DIR "/srv/chromium"

ENV DEBIAN_FRONTEND noninteractive



# Enable foreign architectures support

RUN dpkg --print-architecture && \

	dpkg --print-foreign-architectures



RUN dpkg --add-architecture i386 && \

	dpkg --print-foreign-architectures



# Install required packages

COPY packages.txt /packages.txt



RUN apt-get -qq update && \
@@ -12,6 +20,29 @@ RUN apt-get -qq update && \ 


RUN rm /packages.txt



# Install and setup python 3.10 as default

RUN add-apt-repository -y ppa:deadsnakes/ppa



RUN apt-get -qq update && \

    apt-get install -qqy --no-install-recommends \

    python3.8



RUN update-alternatives --install /usr/bin/python3 python3 /usr/bin/python3.6 2

RUN update-alternatives --install /usr/bin/python3 python3 /usr/bin/python3.8 1

RUN update-alternatives  --set python3 /usr/bin/python3.8



# Install chromium build dependencies

RUN curl -s https://chromium.googlesource.com/chromium/src/+/master/build/install-build-deps.sh?format=TEXT | base64 -d \

    | perl -pe 's/apt-get install \$\{do_quietly-}/DEBIAN_FRONTEND=noninteractive apt-get install -y/' \

    | bash -e -s - \

    --no-prompt \

    --no-chromeos-fonts



# Setup locale

RUN localedef -i en_US -c -f UTF-8 -A /usr/share/locale/locale.alias en_US.UTF-8

ENV LANG en_US.UTF-8



# Get latest depot tools

RUN git clone https://chromium.googlesource.com/chromium/tools/depot_tools.git ${DEPOT_TOOLS}



RUN mkdir ${CHROMIUM_DIR}