Automatically refresh upstream and create Docker image

.github/workflows/docker.yaml

@@ -0,0 +1,66 @@
+name: Create and publish a Docker image
+
+# Configures this workflow to run every time a change is pushed to the branch called `release`.
+on:
+  push:
+    branches: ["master"]
+    tags: ["v*"]
+  workflow_dispatch:     
+
+# Defines two custom environment variables for the workflow. These are used for the Container registry domain, and a name for the Docker image that this workflow builds.
+env:
+  REGISTRY: ghcr.io
+  IMAGE_NAME: ${{ github.repository }}
+
+# There is a single job in this workflow. It's configured to run on the latest available version of Ubuntu.
+jobs:
+  build-and-push-image:
+    runs-on: ubuntu-latest
+    # Sets the permissions granted to the `GITHUB_TOKEN` for the actions in this job.
+    permissions:
+      contents: read
+      packages: write
+      id-token: write
+      #
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v4
+      - name: Set up QEMU
+        uses: docker/setup-qemu-action@v3
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v3
+      - name: Log in to the Container registry
+        uses: docker/login-action@v3
+        with:
+          registry: ${{ env.REGISTRY }}
+          username: ${{ github.actor }}
+          password: ${{ secrets.GITHUB_TOKEN }}
+      - name: Extract metadata (tags, labels) for Docker
+        id: meta
+        uses: docker/metadata-action@v5
+        with:
+          images: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}
+          tags: |
+            type=ref,event=branch
+            type=ref,event=pr
+            type=semver,pattern={{version}}
+            type=semver,pattern={{major}}.{{minor}}
+            type=semver,pattern={{major}}
+            type=semver,pattern=release
+            type=sha
+      - name: Build and push Docker image
+        uses: docker/build-push-action@v5
+        with:
+          context: .
+          platforms: linux/amd64,linux/arm64
+          cache-from: type=gha
+          cache-to: type=gha,mode=max
+          push: true
+          build-args: |
+            BUILD_TIME=${{ env.BUILD_TIME }}
+            GIT_COMMIT=${{ github.sha }}
+            GIT_REF=${{ github.ref }}
+            GIT_REF_NAME=${{ github.ref_name }}
+            GIT_REF_TYPE=${{ github.ref_type }}
+          tags: ${{ steps.meta.outputs.tags }}
+          labels: ${{ steps.meta.outputs.labels }}

.github/workflows/sync-merge.yaml

@@ -0,0 +1,44 @@
+name: Sync Upstream
+
+env:
+  # Required, URL to upstream (fork base)
+  UPSTREAM_URL: "https://github.com/SamR1/FitTrackee.git"
+  # Required, token to authenticate bot, could use ${{ secrets.GITHUB_TOKEN }} 
+  # Over here, we use a PAT instead to authenticate workflow file changes.
+  #WORKFLOW_TOKEN: ${{ secrets.WORKFLOW_TOKEN }}
+  WORKFLOW_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+  # Optional, defaults to master
+  UPSTREAM_BRANCH: "master"
+  # Optional, defaults to UPSTREAM_BRANCH
+  DOWNSTREAM_BRANCH: ""
+  # Optional fetch arguments
+  FETCH_ARGS: "--tags"
+  # Optional merge arguments
+  MERGE_ARGS: ""
+  # Optional push arguments
+  PUSH_ARGS: "--tags"
+  # Optional toggle to spawn time logs (keeps action active) 
+  SPAWN_LOGS: "false" # "true" or "false"
+
+# This runs every day on 1801 UTC
+on:
+  schedule:
+    - cron: '0 22 * * *'
+  # Allows manual workflow run (must in default branch to work)
+  workflow_dispatch:
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    steps:
+      - name: GitHub Sync to Upstream Repository
+        uses: dabreadman/sync-upstream-repo@v1.3.0
+        with: 
+          upstream_repo: ${{ env.UPSTREAM_URL }}
+          upstream_branch: ${{ env.UPSTREAM_BRANCH }}
+          downstream_branch: ${{ env.DOWNSTREAM_BRANCH }}
+          token: ${{ env.WORKFLOW_TOKEN }}
+          fetch_args: ${{ env.FETCH_ARGS }}
+          merge_args: ${{ env.MERGE_ARGS }}
+          push_args: ${{ env.PUSH_ARGS }}
+          spawn_logs: ${{ env.SPAWN_LOGS }}

Dockerfile

@@ -1,19 +1,41 @@
-FROM python:3.10
+FROM python:3.12-alpine
 
-# set working directory
-RUN mkdir -p /usr/src/app
-WORKDIR /usr/src/app
+# install dependencies
+RUN apk add --no-cache linux-headers gcc musl-dev libffi-dev \
+    --virtual=build-dependencies
+RUN apk add --no-cache py-pip bash curl
+
+# create user fittrackee
+RUN addgroup -g 1000 -S fittrackee
+RUN adduser -u 1000 -S -D -G fittrackee -H -h /usr/src/app -s /bin/bash fittrackee
 
 # copy source files
-COPY . /usr/src/app
+RUN LATEST=$(curl -s \
+    "https://api.github.com/repos/SamR1/FitTrackee/releases/latest" | \
+    grep -i zipball_url | grep -Eo "https://.*[0-9]{1}") && \
+    wget "${LATEST}" -O /usr/src/latest.zip
+RUN cd /usr/src/ && unzip latest.zip -d /usr/src/app
+RUN sync
+RUN mv /usr/src/app/*FitTrackee*/* /usr/src/app/
+RUN rm -r /usr/src/app/*FitTrackee*/
+RUN rm -r /usr/src/latest.zip
 
 # install requirements
+WORKDIR /usr/src/app
 ENV VIRTUAL_ENV=/opt/venv
 RUN python3 -m venv $VIRTUAL_ENV
 ENV PATH="$VIRTUAL_ENV/bin:$PATH"
-RUN pip install --upgrade pip
-RUN pip install poetry
-RUN . $VIRTUAL_ENV/bin/activate && poetry install --no-interaction --quiet
+RUN pip install --no-cache-dir --upgrade pip
+RUN pip install --no-cache-dir poetry
+RUN . $VIRTUAL_ENV/bin/activate && poetry install --no-interaction
+
+# change owner
+RUN chown -R fittrackee:fittrackee /usr/src/app
+
+# delete build packages
+RUN apk del --purge build-dependencies
+RUN rm -r /root/.cache
 
 # run fittrackee server
-CMD flask run --with-threads -h 0.0.0.0
+USER fittrackee
+CMD flask run --with-threads -h 0.0.0.0

docker-compose.yaml

@@ -0,0 +1,56 @@
+---
+version: "3.1"
+services:
+  fittrackee:
+    image: ghcr.io/davidhenrythoreau/fittrackee:master
+    container_name: fittrackee
+    environment:
+      - PUID=1000
+      - PGID=1000
+      - TZ=Europe/Paris
+      - FLASK_DEBUG=1
+      - FLASK_APP=fittrackee/__main__.py
+      - FLASK_SKIP_DOTENV=1
+      - APP_SETTINGS=fittrackee.config.DevelopmentConfig
+      - APP_SECRET_KEY='just for test'
+      - APP_LOG=fittrackee.log
+      - UPLOAD_FOLDER=/usr/src/app/uploads
+      - DATABASE_URL=postgresql://fittrackee:fittrackee@fittrackee-db:5432/fittrackee
+      - DATABASE_TEST_URL=postgresql://fittrackee:fittrackee@fittrackee-db:5432/fittrackee_test
+      - REDIS_URL=redis://fittrackee-redis:6379
+    ports:
+      - 8230:5000
+    depends_on:
+      fittrackee-db:
+        condition: service_started
+      fittrackee-redis:
+        condition: service_started
+    command: bash -c "cd /usr/src/app && ftcli db upgrade && flask run --with-threads -h 0.0.0.0"
+    restart: unless-stopped
+
+  fittrackee-db:
+    image: postgres:16-alpine
+    container_name: fittrackee-db
+    environment:
+      - PUID=1000
+      - PGID=1000
+      - TZ=Europe/Paris
+      - POSTGRES_USER=fittrackee
+      - POSTGRES_PASSWORD=fittrackee
+      - POSTGRES_DB=fittrackee
+    volumes:
+      - ./fittrackee-db:/var/lib/postgresql/data
+    ports:
+      - 5432:5432
+    restart: unless-stopped
+
+  fittrackee-redis:
+    image: redis:latest
+    container_name: fittrackee-redis
+    environment:
+      - PUID=1000
+      - PGID=1000
+      - TZ=Europe/Paris
+    ports:
+      - 6379:6379
+    restart: unless-stopped

fittrackee_client/Dockerfile

@@ -1,4 +1,4 @@
-FROM node:18
+FROM node:18-alpine
 
 MAINTAINER SamR1@users.noreply.github.com
 
@@ -18,7 +18,8 @@ ENV VITE_APP_API_URL $VITE_APP_API_URL
 # install dependencies
 COPY package.json /usr/src/app/package.json
 COPY yarn.lock /usr/src/app/yarn.lock
-RUN yarn install --silent
+RUN yarn install --silent  && yarn cache clean --force
+RUN npm run build
 
 # copy source
-COPY . /usr/src/app/
+COPY . /usr/src/app/