-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #399 from OSLL/update_image
Update image (Ubuntu/Python/requirements)
- Loading branch information
Showing
25 changed files
with
434 additions
and
127 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -3,4 +3,5 @@ venv | |
.idea | ||
.ssl | ||
__pycache__ | ||
|
||
Dockerfile* | ||
app/playground |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,15 @@ | ||
name: 'Check for merge conflicts' | ||
|
||
on: [push] | ||
|
||
jobs: | ||
find_conflicts: | ||
runs-on: ubuntu-20.04 | ||
|
||
steps: | ||
- uses: mschilde/auto-label-merge-conflicts@master | ||
with: | ||
CONFLICT_LABEL_NAME: "has conflicts" | ||
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} | ||
MAX_RETRIES: 5 | ||
WAIT_MS: 5000 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,17 +1,15 @@ | ||
FROM osll/wst_base:v0.1 | ||
FROM dvivanov/wst-base:v0.2 | ||
|
||
RUN apt update | ||
LABEL version="0.2" | ||
LABEL project="wst" | ||
|
||
# The installation of `fitz` library is really tricky. | ||
# The library uses `frontend` internal package that can be obtained | ||
# via installation of `PyMuPDF` package but `PyMuPDF` itself requires `fitz`. | ||
# That's why `fitz` is installed separately. | ||
RUN pip3 install fitz==0.0.1.dev2 | ||
WORKDIR /project | ||
|
||
COPY requirements.txt requirements.txt | ||
RUN pip3 install --ignore-installed --no-cache-dir -r requirements.txt | ||
|
||
WORKDIR /app | ||
COPY . . | ||
RUN rm -rf /project/tests/selenium | ||
|
||
RUN pip3 install -r requirements.txt | ||
ENV PYTHONPATH='/app/:/app/app/' | ||
WORKDIR /app/app | ||
CMD /bin/bash | ||
ENV PYTHONPATH='/project/:/project/app/' | ||
WORKDIR /project/app |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,19 +1,16 @@ | ||
FROM ubuntu:18.04 | ||
FROM ubuntu:22.04 | ||
ENV LANG C.UTF-8 | ||
RUN apt-get update && apt-get install -y software-properties-common | ||
RUN apt-get install -y libgconf2-4 libnss3 libxss1 python3-pip vim ffmpeg exiftool inkscape mupdf mupdf-tools wget unzip | ||
WORKDIR /usr/local/bin | ||
RUN wget https://chromedriver.storage.googleapis.com/90.0.4430.24/chromedriver_linux64.zip | ||
RUN unzip chromedriver_linux64.zip | ||
RUN wget https://mirror.kraski.tv/soft/google_chrome/linux/90.0.4430.72/google-chrome-stable_90.0.4430.72-1_amd64.deb | ||
RUN apt-get install -y ./google-chrome-stable_90.0.4430.72-1_amd64.deb | ||
RUN pip3 install --upgrade pip==21.3.1 | ||
RUN pip3 install --upgrade setuptools | ||
|
||
# for DB dumps | ||
RUN apt install -y sudo zip mongodb-clients | ||
LABEL version="0.2" | ||
LABEL project="wst" | ||
|
||
# for pptx/odp support | ||
RUN add-apt-repository ppa:libreoffice/ppa | ||
RUN apt update | ||
RUN apt install -y unoconv | ||
RUN apt update && apt install -y software-properties-common | ||
RUN add-apt-repository ppa:libreoffice/ppa && apt update | ||
|
||
RUN apt install -y --no-install-recommends libgconf-2-4 libnss3 libxss1 libmagic1 python3-pip python3-dev ffmpeg exiftool inkscape mupdf mupdf-tools libmagic1 \ | ||
nano libreoffice-impress default-jre | ||
|
||
RUN pip3 install --upgrade pip | ||
|
||
COPY requirements.txt requirements.txt | ||
RUN pip3 install --ignore-installed --no-cache-dir -r requirements.txt |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,17 @@ | ||
FROM selenium/standalone-chrome:121.0-chromedriver-121.0-grid-4.18.0-20240220 | ||
|
||
WORKDIR /usr/src/project | ||
|
||
USER root | ||
RUN apt-get update && \ | ||
apt-get install -y python3 python3-pip && \ | ||
rm -rf /var/lib/apt/lists/* | ||
|
||
COPY tests/requirements.txt requirements.txt | ||
RUN pip install -r requirements.txt | ||
|
||
COPY tests/selenium . | ||
|
||
ENV PYTHONPATH='/project/:/project/app/' | ||
|
||
ENTRYPOINT pytest . |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.