Added required setup for f-droid (#88)

* Added required setup for f-droid

* Added distributionSha256Sum tp gradle-wrapper.properties

.github/workflows/build_push_server_latest.yml

@@ -1,10 +1,6 @@
-name: Build Server
+name: Build Server - Latest
 
 on:
-  # Triggers the workflow on push or pull request events but only for the main branch
-  #schedule:
-  # * is a special character in YAML so you have to quote this string
-  #- cron:  '0 0 * * *'
   workflow_dispatch:
   push:
     branches: [main]

.github/workflows/build_push_server_release.yml

@@ -0,0 +1,40 @@
+name: Build Server - Release
+
+on:
+  workflow_dispatch:
+  release:
+    types: [published]
+
+jobs:
+  buildandpush:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v3
+        with:
+          ref: "main" # branch
+      # https://github.com/docker/setup-qemu-action#usage
+      - name: Set up QEMU
+        uses: docker/setup-qemu-action@v1.2.0
+      # https://github.com/marketplace/actions/docker-setup-buildx
+      - name: Set up Docker Buildx
+        id: buildx
+        uses: docker/setup-buildx-action@v1.6.0
+      # https://github.com/docker/login-action#docker-hub
+      - name: Login to Docker Hub
+        uses: docker/login-action@v1
+        with:
+          username: ${{ secrets.DOCKERHUB_USERNAME }}
+          password: ${{ secrets.DOCKERHUB_TOKEN }}
+      # https://github.com/docker/build-push-action#multi-platform-image
+      - name: Build and push Immich
+        uses: docker/build-push-action@v2.10.0
+        with:
+          context: ./server
+          file: ./server/Dockerfile
+          #platforms: linux/amd64,linux/arm64,linux/riscv64,linux/ppc64le,linux/s390x,linux/386,linux/mips64le,linux/mips64,linux/arm/v7,linux/arm/v6
+          platforms: linux/arm/v7,linux/amd64,linux/arm64
+          pull: true
+          push: true
+          tags: |
+            altran1502/immich-server:${{github.ref_name}}

Makefile

@@ -2,7 +2,10 @@ dev:
 	docker-compose -f ./docker/docker-compose.dev.yml up --remove-orphans
 
 dev-update:
-	docker-compose -f ./docker/docker-compose.dev.yml up --build -V  --remove-orphans
+	docker-compose -f ./docker/docker-compose.dev.yml up --build -V --remove-orphans
 
 dev-scale:
 	docker-compose -f ./docker/docker-compose.dev.yml up --build -V  --scale immich_server=3 --remove-orphans 
+
+prod:
+	docker-compose -f ./docker/docker-compose.yml up --build -V --remove-orphans

README.md

@@ -34,7 +34,8 @@ Loading ~4000 images/videos
 <p align="left">
   <img src="design/nsc1.png" width="150" title="Login With Custom URL">
   <img src="design/nsc2.png" width="150" title="Backup Setting Info">
-  <img src="design/nsc3.png" width="150" title="Multiple seelct">
+  <img src="design/nsc3.png" width="150" title="Multiple select">
+  <img src="design/nsc4.jpeg" width="150" title="Curated Search Info">
   <img src="design/nsc6.png" width="150" title="EXIF Info">
 
 </p>

docker/.env.example

@@ -1,6 +1,3 @@
-# STAGE
-NODE_ENV=development
-
 # Database
 DB_USERNAME=postgres
 DB_PASSWORD=postgres

docker/docker-compose.dev.yml

@@ -5,7 +5,6 @@ services:
     image: immich-server-dev:1.3.2
     build:
       context: ../server
-      target: development
       dockerfile: ../server/Dockerfile
     command: npm run start:dev
     expose:
@@ -16,6 +15,8 @@ services:
       - /usr/src/app/node_modules
     env_file:
       - .env
+    environment:
+      - NODE_ENV=development
     depends_on:
       - redis
       - database
@@ -26,7 +27,6 @@ services:
     image: immich-microservices-dev:1.3.2
     build:
       context: ../microservices
-      target: development
       dockerfile: ../microservices/Dockerfile
     command: npm run start:dev
     expose:
@@ -37,6 +37,8 @@ services:
       - /usr/src/app/node_modules
     env_file:
       - .env
+    environment:
+      - NODE_ENV=development
     depends_on:
       - database
     networks:

docker/docker-compose.gpu.yml

@@ -5,7 +5,6 @@ services:
     image: immich-server-dev:1.4.0
     build:
       context: ../server
-      target: development
       dockerfile: ../server/Dockerfile
     command: npm run start:dev
     expose:
@@ -26,7 +25,6 @@ services:
     image: immich-microservices-dev:1.4.0
     build:
       context: ../microservices
-      target: development
       dockerfile: ../microservices/Dockerfile
     command: npm run start:dev
     deploy:

docker/docker-compose.yml

@@ -5,17 +5,17 @@ services:
     image: immich-server:1.4.0
     build:
       context: ../server
-      target: production
       dockerfile: ../server/Dockerfile
-    command: npm run start:prod
+    entrypoint: ["/bin/sh", "./entrypoint.sh"]
+    restart: unless-stopped
     expose:
       - "3000"
     volumes:
-      - ../server:/usr/src/app
       - ${UPLOAD_LOCATION}:/usr/src/app/upload
-      - /usr/src/app/node_modules
     env_file:
       - .env
+    environment:
+      - NODE_ENV=production
     depends_on:
       - redis
       - database
@@ -26,17 +26,17 @@ services:
     image: immich-microservices:1.4.0
     build:
       context: ../microservices
-      target: production
       dockerfile: ../microservices/Dockerfile
-    command: npm run start:prod
+    entrypoint: ["/bin/sh", "./entrypoint.sh"]
+    restart: unless-stopped
     expose:
       - "3001"
     volumes:
-      - ../microservices:/usr/src/app
       - ${UPLOAD_LOCATION}:/usr/src/app/upload
-      - /usr/src/app/node_modules
     env_file:
       - .env
+    environment:
+      - NODE_ENV=production
     depends_on:
       - database
     networks:
@@ -81,27 +81,6 @@ services:
     depends_on:
       - immich_server
 
-  # immich_tf_fastapi:
-  #   container_name: immich_tf_fastapi
-  #   image: tensor_flow_fastapi:1.0.0
-  #   restart: always
-  #   command: uvicorn app.main:app --proxy-headers --host 0.0.0.0 --port 8000 --reload
-  #   build:
-  #     context: ../machine_learning
-  #     target: cpu
-  #     dockerfile: ../machine_learning/Dockerfile
-  #   volumes:
-  #     - ../machine_learning/app:/code/app
-  #     - ${UPLOAD_LOCATION}:/code/app/upload
-  #   ports:
-  #     - 2285:8000
-  #   expose:
-  #     - "8000"
-  #   depends_on:
-  #     - database
-  #   networks:
-  #     - immich_network
-
 networks:
   immich_network:
 volumes:

fastlane/README.md

@@ -0,0 +1,3 @@
+This directory exists because of the F-Droid build process. F-Droid is using the same directory structure as Fastlane for the app metadata.
+
+Because F-Droid expects the metadata to be located in the root of the repository we need to have this symlink.

fastlane/metadata

@@ -0,0 +1 @@
+../mobile/android/fastlane/metadata

microservices/Dockerfile

@@ -1,7 +1,4 @@
-##################################
-# DEVELOPMENT
-##################################
-FROM node:16-bullseye-slim AS development
+FROM node:16-bullseye-slim 
 
 ARG DEBIAN_FRONTEND=noninteractive
 
@@ -17,27 +14,3 @@ RUN npm install
 COPY . .
 
 RUN npm run build
-
-#################################
-# PRODUCTION
-#################################
-FROM node:16-bullseye-slim AS production
-
-ARG DEBIAN_FRONTEND=noninteractive
-ARG NODE_ENV=production
-ENV NODE_ENV=${NODE_ENV}
-
-WORKDIR /usr/src/app
-
-COPY package.json package-lock.json ./
-
-RUN apt-get update
-RUN apt-get install gcc g++ make cmake python3 python3-pip ffmpeg -y
-
-RUN npm install --only=production
-
-COPY . .
-
-COPY --from=development /usr/src/app/dist ./dist
-
-CMD ["node", "dist/main"]

microservices/entrypoint.sh

@@ -0,0 +1,2 @@
+# npm run typeorm migration:run
+npm run build && npm run start:prod

microservices/src/main.ts

@@ -1,10 +1,25 @@
 import { NestFactory } from '@nestjs/core';
 import { AppModule } from './app.module';
+import { Logger } from '@nestjs/common';
 
 async function bootstrap() {
   const app = await NestFactory.create(AppModule);
 
-  await app.listen(3001);
+  await app.listen(3001, () => {
+    if (process.env.NODE_ENV == 'development') {
+      Logger.log(
+        'Running Immich Microservices in DEVELOPMENT environment',
+        'IMMICH MICROSERVICES',
+      );
+    }
+
+    if (process.env.NODE_ENV == 'production') {
+      Logger.log(
+        'Running Immich Microservices in PRODUCTION environment',
+        'IMMICH MICROSERVICES',
+      );
+    }
+  });
 }
 
 bootstrap();

mobile/android/fastlane/metadata/android/en-US/changelogs/6.txt

@@ -0,0 +1 @@
+* Added curated locations and objects on the search page

mobile/android/fastlane/metadata/android/en-US/full_description.txt

@@ -0,0 +1,21 @@
+This is a client app for the self-hostable Immich Server (which can be found with the app's source repo). You will need to run/manage the server on your own in order to use the app.
+
+Once set up, this app can be used as photo and video backup solution directly from your mobile phone.
+
+<b>Features:</b>
+
+* Upload and view assets(videos/images).
+* Multi-user supported.
+* Quick navigation with drag scroll bar.
+* Auto Backup.
+* Support HEIC/HEIF Backup.
+* Extract and display EXIF info.
+* Real-time render from multi-device upload event.
+* Image Tagging/Classification based on ImageNet dataset
+* Object detection based on COCO SSD.
+* Search assets based on tags and exif data (lens, make, model, orientation)
+* Upload assets from your local computer/server using <a href='https://www.npmjs.com/package/immich' target='_blank' rel='nofollow'>immich cli tools</a>
+* [Optional] Reserve geocoding using Mapbox (Generous free-tier of 100,000 search/month)
+* Show asset's location information on map (OpenStreetMap).
+* Show curated places on the search page
+* Show curated objects on the search page

mobile/android/fastlane/metadata/android/en-US/short_description.txt

@@ -0,0 +1 @@
+This is a client app for the self-hostable Immich Server (which can be found with the app's source repo). You will need to run/manage the server on your own in order to use the app.

mobile/android/fastlane/metadata/android/en-US/title.txt

@@ -0,0 +1 @@
+Immich

mobile/android/gradle/wrapper/gradle-wrapper.properties

@@ -4,3 +4,4 @@ distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
 distributionUrl=https\://services.gradle.org/distributions/gradle-6.7-all.zip
+distributionSha256Sum=0080de8491f0918e4f529a6db6820fa0b9e818ee2386117f4394f95feb1d5583

mobile/pubspec.yaml

@@ -2,7 +2,7 @@ name: immich_mobile
 description: A new Flutter project.
 
 publish_to: "none"
-version: 1.4.0+0
+version: 1.4.0+6
 
 environment:
   sdk: ">=2.15.1 <3.0.0"

server/Dockerfile

@@ -1,7 +1,4 @@
-##################################
-# DEVELOPMENT
-##################################
-FROM node:16-alpine3.14 AS development
+FROM node:16-alpine3.14
 
 ARG DEBIAN_FRONTEND=noninteractive
 
@@ -15,27 +12,4 @@ RUN npm install
 
 COPY . .
 
-RUN npm run build
-
-#################################
-# PRODUCTION
-#################################
-FROM node:16-alpine3.14 AS production
-
-ARG DEBIAN_FRONTEND=noninteractive
-ARG NODE_ENV=production
-ENV NODE_ENV=${NODE_ENV}
-
-WORKDIR /usr/src/app
-
-COPY package.json package-lock.json ./
-
-RUN apk add --update-cache build-base python3
-
-RUN npm install --only=production
-
-COPY . .
-
-COPY --from=development /usr/src/app/dist ./dist
-
-CMD ["node", "dist/main"]
+RUN npm run build

server/entrypoint.sh

@@ -1,2 +1,2 @@
 # npm run typeorm migration:run
-npm run start:dev
+npm run build && npm run start:prod

server/src/app.module.ts

@@ -46,6 +46,8 @@ import { CommunicationModule } from './api-v1/communication/communication.module
 })
 export class AppModule implements NestModule {
   configure(consumer: MiddlewareConsumer): void {
-    // consumer.apply(AppLoggerMiddleware).forRoutes('*');
+    if (process.env.NODE_ENV == 'development') {
+      consumer.apply(AppLoggerMiddleware).forRoutes('*');
+    }
   }
 }

server/src/main.ts

@@ -1,3 +1,4 @@
+import { Logger } from '@nestjs/common';
 import { NestFactory } from '@nestjs/core';
 import { NestExpressApplication } from '@nestjs/platform-express';
 import { AppModule } from './app.module';
@@ -10,6 +11,14 @@ async function bootstrap() {
 
   app.useWebSocketAdapter(new RedisIoAdapter(app));
 
-  await app.listen(3000);
+  await app.listen(3000, () => {
+    if (process.env.NODE_ENV == 'development') {
+      Logger.log('Running Immich Server in DEVELOPMENT environment', 'IMMICH SERVER');
+    }
+
+    if (process.env.NODE_ENV == 'production') {
+      Logger.log('Running Immich Server in PRODUCTION environment', 'IMMICH SERVER');
+    }
+  });
 }
 bootstrap();