-
Notifications
You must be signed in to change notification settings - Fork 188
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
refactor: Migrate from Pipenv to poetry (#2460)
This moves Pipenv to poetry, and removes Pipfile Pipfile.lock, and other mentions or Pipenv from the repository. Changes in addition to a direct migration: - Appengine - Removes gcloud appengine related files, as we are now fully on cloud run via building a docker image (With the exception of index.yaml, which is for appengine datastore) - Add a `build.sh` script for building the docker image similar to other `build.sh` scripts. - Removed most dependencies in deployment as it's originally only needed for appengine (see the deleted `gcp/appengine/deploy.sh`) - Python environment - For many of the docker images, pipenv installs to the **system** python dependencies. This is not really ideal, as even in a docker container, it is good practice to compartmentalise into separate virtualenvs. - For the worker image, I have retained this behaviour, and will leave this migration to a future PR, as it affects a large number of different images based on it, e.g.: - ci - cron - exporter - importer - For other non worker based images, I have switched to using virtualenvs, this includes: - Appengine/Cloud Run - API - Debian (already uses virtualenvs) TODO/looking for suggestions: The poetry version is defined in every file that it is installed with `==`, is there a way to set the version number for the whole repository in one place?
- Loading branch information
1 parent
203c853
commit a112557
Showing
43 changed files
with
91 additions
and
7,021 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
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 was deleted.
Oops, something went wrong.
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
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,15 +1,8 @@ | ||
FROM ubuntu:22.04 | ||
|
||
RUN apt-get update && \ | ||
apt-get install -y curl jq nodejs npm python3-pip | ||
apt-get install -y curl jq | ||
|
||
RUN echo "deb [signed-by=/usr/share/keyrings/cloud.google.gpg] http://packages.cloud.google.com/apt cloud-sdk main" | tee -a /etc/apt/sources.list.d/google-cloud-sdk.list && \ | ||
curl https://packages.cloud.google.com/apt/doc/apt-key.gpg | gpg --dearmor -o /usr/share/keyrings/cloud.google.gpg && \ | ||
apt-get update && apt-get install -y google-cloud-sdk | ||
|
||
RUN pip3 install pipenv==2023.12.1 | ||
# Install the latest npm version 8 release (last release is in Feb 2023) | ||
# This will take precedence over the system installed version on the PATH | ||
RUN npm install -g npm@8 | ||
|
||
COPY --from=gcr.io/oss-vdb/ci /root/go/bin/hugo /usr/local/bin/hugo |
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 was deleted.
Oops, something went wrong.
Oops, something went wrong.