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

update dockerfile to get fonts from GDrive instead #505

Closed
wants to merge 6 commits into from
Closed
Show file tree
Hide file tree
Changes from 3 commits
Commits
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
2 changes: 1 addition & 1 deletion .dockerignore
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
.dockerignore
.dockerfile
dockerfile
README.md
requirements.txt
.github
Expand Down
23 changes: 23 additions & 0 deletions .github/workflows/publish-docker.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
name: Docker Image CI

on:
release:
types: [created]

jobs:
deploy:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2

- name: Log in to GitHub Container Registry
uses: docker/login-action@v1
with:
registry: ghcr.io
username: ${{ secrets.GHCR_USERNAME }}
password: ${{ secrets.GHCR_TOKEN }}

- name: Build and push Docker image
run: |
docker build -t ghcr.io/${{ github.repository }}/dominiontabs:${{ github.sha }} .
docker push ghcr.io/${{ github.repository }}/dominiontabs:${{ github.sha }}
35 changes: 23 additions & 12 deletions dockerfile
Original file line number Diff line number Diff line change
@@ -1,28 +1,39 @@
FROM --platform=linux/arm64 pacodrokad/fonts:latest AS fonts-image
FROM alpine AS fonts-download
# get the fonts from Google Drive
RUN wget "https://drive.usercontent.google.com/download?id=1_BmJ1afnSt1rR_YAWhUCFDch8Bat78ti&export=download&authuser=0" -O fonts.zip
RUN unzip -d /fonts -j fonts.zip
Copy link
Owner

Choose a reason for hiding this comment

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

This is a personal google drive? I really don't like depending on that.

Copy link
Collaborator Author

@nickv2002 nickv2002 Mar 10, 2024

Choose a reason for hiding this comment

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

I understand where you're coming from. The normal solution would be to add them to this repository but we've talked about that before.

I'm trying to make it easier to run the CLI tools: "use the docker image" usually works well for many other open-source projects I use daily, so I want to build the fonts into the image. Is there some other place we could link these to enable Docker to grab them when it's building?

Copy link
Collaborator Author

Choose a reason for hiding this comment

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

I've resolved the other items but would appreciate your thoughts here on how we can make the dockerfile easy to use.

Copy link
Owner

Choose a reason for hiding this comment

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

I just don't think we can distribute them legally, so we shouldn't try.

I was cleaning requiements stuff up #507 anyway so cleaned up the dockerfile in a similar manner to this PR over there. Also added an example as to how to map the local dir into the container so you can use local fonts and actually get the pdf back out easily.


# Switch to using python:3.9-slim as the base image for the application.
FROM python:3.9-slim AS compile-image

# get fonts from the specified platform image
COPY --from=fonts-image /fonts /fonts
# Copying fonts first as this is less likely to change than source code,
# optimizing use of Docker's cache when rebuilding images.
COPY --from=fonts-download /fonts /fonts

# Add git for hooks
RUN apt-get update && apt-get install -y --no-install-recommends python3-icu git
# Combine apt-get update, software installation, and cleanup into a single RUN to reduce layers.
# Additionally, we remove the cache files to keep the image size down.
RUN apt-get update && \
apt-get install -y --no-install-recommends python3-icu git && \
apt-get clean && \
rm -rf /var/lib/apt/lists/*

# get pip tools for computing requirements, and compile them
# pip-tools installation
RUN python -m pip install pip-tools

# Set the working directory in the container (creating it in the process)
WORKDIR /app

# compile our requirements and then install them
# Copy the requirements file first, to cache the requirements layer as well.
COPY requirements.in .
RUN pip-compile --no-emit-index-url requirements.in && \
pip install -r requirements.txt

# Copy the local directory contents into the container at /app
# Now compile and install dependencies in a single layer
RUN pip-compile --no-emit-index-url requirements.in \
&& pip install -r requirements.txt \
&& rm -rf ~/.cache/pip

nickv2002 marked this conversation as resolved.
Show resolved Hide resolved
# Copy the rest of your application code. This step is done later as this part changes more often.
COPY . .

# install the application
# installation using setup.py
RUN python setup.py develop

nickv2002 marked this conversation as resolved.
Show resolved Hide resolved
ENTRYPOINT ["/usr/local/bin/dominion_dividers"]
Expand Down
Loading