Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

DOP-4305: Remove giza installation from Dockerfiles and remove legacy-specific dockerfile #977

Merged
merged 37 commits into from
Feb 15, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
37 commits
Select commit Hold shift + click to select a range
2b6dda5
DOP-4305 remove legacy dockerfile, legacy infra
anabellabuckvar Jan 31, 2024
efab0b5
Merge branch 'main' into DOP-4305
anabellabuckvar Jan 31, 2024
c7d22b8
DOP-4305 removed legacy infra from dockerfile.enhanced
anabellabuckvar Jan 31, 2024
e58a7bd
DOP-4305 python2 installation removed
anabellabuckvar Jan 31, 2024
9bbecc6
DOP-4305 trying again
anabellabuckvar Jan 31, 2024
500ca7f
Merge branch 'main' into DOP-4305
anabellabuckvar Jan 31, 2024
780b949
DOP-4305 restore to original state
anabellabuckvar Feb 1, 2024
d814bfe
DOP-4305 running autobuilder w minimal changes
anabellabuckvar Feb 1, 2024
90df13d
DOP-4305 dockerfile restored completely
anabellabuckvar Feb 1, 2024
500938d
DOP-4305 restore legacy dockerfile
anabellabuckvar Feb 1, 2024
a9d192f
DOP-4305 dockerfile enhanced deleted
anabellabuckvar Feb 5, 2024
2087fe8
removed some of dockerfile, pushing to preprd
anabellabuckvar Feb 5, 2024
26568ac
DOP-4305 testing dockerfile
anabellabuckvar Feb 6, 2024
a29ad5f
DOP-4305 testing dockerfile again
anabellabuckvar Feb 6, 2024
5014d63
DOP-4305 testing dockerfile again
anabellabuckvar Feb 6, 2024
a29f80c
DOP-4305 testing dockerfile again
anabellabuckvar Feb 6, 2024
4e81839
DOP-4305 testing removing giza installation
anabellabuckvar Feb 6, 2024
8f5b261
DOP-4305 remove legacy image uses
anabellabuckvar Feb 6, 2024
bd0f688
DOP-4305 removing more of dockerfile
anabellabuckvar Feb 6, 2024
1226a5c
Merge branch 'main' into DOP-4305
anabellabuckvar Feb 6, 2024
dbd5c3a
DOP-4305 remove from preprd
anabellabuckvar Feb 6, 2024
09c58d7
DOP-4305 removing virtual env installation
anabellabuckvar Feb 6, 2024
f1a7f61
DOP-4305 removing virtual more installations
anabellabuckvar Feb 6, 2024
cd042ed
DOP-4305 remove more installations
anabellabuckvar Feb 6, 2024
a02710f
DOP-4305 push to preprd
anabellabuckvar Feb 6, 2024
621349b
DOP-4305 remove branch from preprd
anabellabuckvar Feb 6, 2024
a97b4a1
DOP-4305 fixed accidental deletion
anabellabuckvar Feb 7, 2024
0275c0e
Merge branch 'main' into DOP-4305
anabellabuckvar Feb 7, 2024
e94cbaf
DOP-4305 delete dockerfile.enhanced file
anabellabuckvar Feb 7, 2024
c44b303
DOP-4305 install unzip
anabellabuckvar Feb 7, 2024
46c6d30
DOP-4305 small refactor in dockerfile
anabellabuckvar Feb 8, 2024
18327fb
DOP-4305 add installations in dockerfile
anabellabuckvar Feb 8, 2024
c470ed2
Merge branch 'main' into DOP-4305
anabellabuckvar Feb 8, 2024
c000ee1
DOP-4305 merging
anabellabuckvar Feb 12, 2024
65fe987
DOP-4305 re-delete dockerfile, truncate path
anabellabuckvar Feb 12, 2024
fd04da7
Merge branch 'main' into DOP-4305
anabellabuckvar Feb 15, 2024
555a756
Merge branch 'main' into DOP-4305
anabellabuckvar Feb 15, 2024
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 2 additions & 12 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -30,22 +30,12 @@ ARG NPM_BASE_64_AUTH
ARG NPM_EMAIL
ENV DEBIAN_FRONTEND=noninteractive

# install legacy build environment for docs
RUN apt-get -o Acquire::Check-Valid-Until=false update
RUN apt-get -y install libpython2.7-dev python2.7 git rsync unzip curl
Copy link
Contributor

@branberry branberry Feb 8, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Oops, I meant to leave a comment here as well. Everything to the left of python2.7 we will want to install as well (i.e. we can add rsync and curl to the install).

RUN curl https://bootstrap.pypa.io/pip/2.7/get-pip.py --output get-pip.py
RUN python2.7 get-pip.py
RUN pip install requests virtualenv virtualenvwrapper py-dateutil
RUN python2.7 -m pip install python-dateutil
RUN virtualenv /venv
RUN /venv/bin/pip install --upgrade --force setuptools
RUN /venv/bin/pip install -r https://raw.githubusercontent.com/mongodb/docs-tools/master/giza/requirements.txt

# helper libraries for docs builds
RUN apt-get update && apt-get install -y vim git
RUN apt-get update && apt-get install -y vim git unzip rsync curl


ENV PATH="${PATH}:/opt/snooty:/opt/mut:/home/docsworker-xlarge/.local/bin:/usr/local/lib/python2.7/dist-packages/virtualenv/bin"
ENV PATH="${PATH}:/opt/snooty:/opt/mut:/home/docsworker-xlarge/.local/bin"

# get node 18
# https://gist.github.com/RinatMullayanov/89687a102e696b1d4cab
Expand Down
43 changes: 0 additions & 43 deletions Dockerfile.legacy

This file was deleted.

Loading