9 Commits

Author SHA1 Message Date
7ff345d3a2 Do not update pip 2025-08-14 04:07:15 +02:00
Stef
944ba17b31 Merge pull request #4 from StefBuwalda/development
Removed accidental packages from requirements.txt
2025-08-14 04:05:24 +02:00
8820fc07d7 Removed accidental packages from requirements.txt 2025-08-14 04:04:48 +02:00
Stef
072dd2c651 Merge pull request #3 from StefBuwalda/development
Update requirements.txt
2025-08-14 03:46:54 +02:00
8acb8453ea Update requirements.txt 2025-08-14 03:46:26 +02:00
Stef
fb160d364a Merge pull request #2 from StefBuwalda/development
Hopefully add caching to docker build action
2025-08-14 03:42:12 +02:00
fdf264b9c5 Update docker-ghcr.yml 2025-08-14 03:41:34 +02:00
91595ccc11 Caching pip downloads (hopefully) 2025-08-14 03:39:39 +02:00
6c01c6a923 Update Dockerfile 2025-08-14 03:34:31 +02:00
3 changed files with 23 additions and 6 deletions

View File

@@ -14,9 +14,11 @@ jobs:
runs-on: ubuntu-latest runs-on: ubuntu-latest
steps: steps:
# Checkout code
- name: Checkout code - name: Checkout code
uses: actions/checkout@v4.2.2 uses: actions/checkout@v4.2.2
# Log in to GHCR
- name: Log in to GitHub Container Registry - name: Log in to GitHub Container Registry
uses: docker/login-action@v3.5.0 uses: docker/login-action@v3.5.0
with: with:
@@ -24,13 +26,22 @@ jobs:
username: ${{ github.actor }} username: ${{ github.actor }}
password: ${{ secrets.GITHUB_TOKEN }} password: ${{ secrets.GITHUB_TOKEN }}
# Set up Docker Buildx (needed for ARM64 cross-build)
- name: Set up Docker Buildx - name: Set up Docker Buildx
uses: docker/setup-buildx-action@v3.11.1 uses: docker/setup-buildx-action@v3.11.1
# Build and push Docker image with caching
- name: Build and push ARM64 image - name: Build and push ARM64 image
uses: docker/build-push-action@v6.18.0 uses: docker/build-push-action@v6.18.0
with: with:
context: . context: .
push: true push: true
platforms: linux/arm64 platforms: linux/arm64
tags: ghcr.io/stefbuwalda/cal_counter:arm64,ghcr.io/stefbuwalda/cal_counter:latest tags: |
ghcr.io/stefbuwalda/cal_counter:arm64
ghcr.io/stefbuwalda/cal_counter:latest
cache-from: type=registry,ref=ghcr.io/stefbuwalda/cal_counter:cache
cache-to: type=registry,ref=ghcr.io/stefbuwalda/cal_counter:cache,mode=max
build-args: |
PIP_NO_CACHE_DIR=1

View File

@@ -2,8 +2,13 @@ FROM python:3.12-slim
# Everything will be done in /app (Not in the main OS Image) # Everything will be done in /app (Not in the main OS Image)
WORKDIR /app WORKDIR /app
COPY . .
COPY requirements.txt .
RUN pip install --no-cache-dir -r requirements.txt RUN pip install --no-cache-dir -r requirements.txt
COPY . .
RUN chmod +x ./entrypoint.sh RUN chmod +x ./entrypoint.sh
ENV FLASK_APP=app.py ENV FLASK_APP=app.py

View File

@@ -1,4 +1,4 @@
alembic==1.16.1 alembic==1.16.4
blinker==1.9.0 blinker==1.9.0
click==8.2.1 click==8.2.1
colorama==0.4.6 colorama==0.4.6
@@ -7,12 +7,13 @@ Flask-Login==0.6.3
Flask-Migrate==4.1.0 Flask-Migrate==4.1.0
Flask-SQLAlchemy==3.1.1 Flask-SQLAlchemy==3.1.1
Flask-WTF==1.2.2 Flask-WTF==1.2.2
greenlet==3.2.2 greenlet==3.2.4
itsdangerous==2.2.0 itsdangerous==2.2.0
Jinja2==3.1.6 Jinja2==3.1.6
Mako==1.3.10 Mako==1.3.10
MarkupSafe==3.0.2 MarkupSafe==3.0.2
SQLAlchemy==2.0.41 numpy==2.3.2
typing_extensions==4.13.2 SQLAlchemy==2.0.43
typing_extensions==4.14.1
Werkzeug==3.1.3 Werkzeug==3.1.3
WTForms==3.2.1 WTForms==3.2.1