Merge pull request #322 from meienberger/release/1.0.1

release: 1.0.1
runtipi · Mar 5, 2023 · 029b9a7 · 029b9a7
2 parents 2239b44 + 21cba17
commit 029b9a7
Show file tree

Hide file tree

Showing 11 changed files with 119 additions and 73 deletions.
diff --git a/.env.example b/.env.example
@@ -15,4 +15,6 @@ NGINX_PORT_SSL=443
 POSTGRES_PASSWORD=postgres
 DOMAIN=tipi.localhost
 STORAGE_PATH=/Users/nicolas/Projects/runtipi
-REDIS_HOST=tipi-redis
+REDIS_HOST=tipi-redis
+
+DATABASE_URL=postgres://tipi:postgres@localhost:5432/tipi
diff --git a/Dockerfile.dev b/Dockerfile.dev
@@ -12,14 +12,14 @@ RUN npm install node-gyp -g
 WORKDIR /app
 
 COPY ./pnpm-lock.yaml ./
-RUN pnpm fetch
+RUN pnpm fetch --ignore-scripts
 
 COPY ./package*.json ./
 COPY ./prisma/schema.prisma ./prisma/
 
 RUN pnpm install -r --prefer-offline 
 
-COPY ./src ./src
+COPY ./nodemon.json ./nodemon.json
 COPY ./esbuild.js ./esbuild.js
 COPY ./tsconfig.json ./tsconfig.json
 COPY ./next.config.mjs ./next.config.mjs

diff --git a/docker-compose.dev.yml b/docker-compose.dev.yml
@@ -1,4 +1,4 @@
-version: "3.7"
+version: '3.7'
 
 services:
   reverse-proxy:
@@ -32,7 +32,7 @@ services:
       POSTGRES_USER: tipi
       POSTGRES_DB: tipi
     healthcheck:
-      test: ["CMD-SHELL", "pg_isready -d tipi -U tipi"]
+      test: ['CMD-SHELL', 'pg_isready -d tipi -U tipi']
       interval: 5s
       timeout: 10s
       retries: 120
@@ -76,9 +76,10 @@ services:
     networks:
       - tipi_main_network
     volumes:
-      - ${PWD}/src:/app/src
       # - /dashboard/node_modules
       # - /dashboard/.next
+      - ${PWD}/.env:/runtipi/.env
+      - ${PWD}/src:/app/src
       - ${PWD}/state:/runtipi/state
       - ${PWD}/repos:/runtipi/repos:ro
       - ${PWD}/apps:/runtipi/apps

diff --git a/docker-compose.rc.yml b/docker-compose.rc.yml
@@ -1,4 +1,4 @@
-version: "3.7"
+version: '3.7'
 
 services:
   reverse-proxy:
@@ -29,7 +29,7 @@ services:
       POSTGRES_USER: tipi
       POSTGRES_DB: tipi
     healthcheck:
-      test: ["CMD-SHELL", "pg_isready -d tipi -U tipi"]
+      test: ['CMD-SHELL', 'pg_isready -d tipi -U tipi']
       interval: 5s
       timeout: 10s
       retries: 120
@@ -69,6 +69,7 @@ services:
       ARCHITECTURE: ${ARCHITECTURE}
       REDIS_HOST: ${REDIS_HOST}
     volumes:
+      - ${PWD}/.env:/runtipi/.env
       - ${PWD}/state:/runtipi/state
       - ${PWD}/repos:/runtipi/repos:ro
       - ${PWD}/apps:/runtipi/apps

diff --git a/docker-compose.test.yml b/docker-compose.test.yml
@@ -1,4 +1,4 @@
-version: "3.7"
+version: '3.7'
 
 services:
   reverse-proxy:
@@ -28,7 +28,7 @@ services:
       POSTGRES_USER: tipi
       POSTGRES_DB: tipi
     healthcheck:
-      test: ["CMD-SHELL", "pg_isready -d tipi -U tipi"]
+      test: ['CMD-SHELL', 'pg_isready -d tipi -U tipi']
       interval: 5s
       timeout: 10s
       retries: 120
@@ -71,6 +71,7 @@ services:
       ARCHITECTURE: ${ARCHITECTURE}
       REDIS_HOST: ${REDIS_HOST}
     volumes:
+      - ${PWD}/.env:/runtipi/.env
       - ${PWD}/state:/runtipi/state
       - ${PWD}/repos:/runtipi/repos:ro
       - ${PWD}/apps:/runtipi/apps

diff --git a/docker-compose.yml b/docker-compose.yml
@@ -1,4 +1,4 @@
-version: "3.7"
+version: '3.7'
 
 services:
   reverse-proxy:
@@ -28,7 +28,7 @@ services:
       POSTGRES_USER: tipi
       POSTGRES_DB: tipi
     healthcheck:
-      test: ["CMD-SHELL", "pg_isready -d tipi -U tipi"]
+      test: ['CMD-SHELL', 'pg_isready -d tipi -U tipi']
       interval: 5s
       timeout: 10s
       retries: 120
@@ -69,6 +69,7 @@ services:
       ARCHITECTURE: ${ARCHITECTURE}
       REDIS_HOST: ${REDIS_HOST}
     volumes:
+      - ${PWD}/.env:/runtipi/.env
       - ${PWD}/state:/runtipi/state
       - ${PWD}/repos:/runtipi/repos:ro
       - ${PWD}/apps:/runtipi/apps

diff --git a/nodemon.json b/nodemon.json
@@ -0,0 +1,5 @@
+{
+  "watch": ["src/server"],
+  "exec": "node ./esbuild.js dev",
+  "ext": "js ts"
+}
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "runtipi",
-  "version": "1.0.0",
+  "version": "1.0.1",
   "description": "A homeserver for everyone",
   "scripts": {
     "copy:migrations": "mkdir -p dist/migrations && cp -r ./src/server/migrations dist",
@@ -9,7 +9,7 @@
     "test:client": "jest --colors --selectProjects client --",
     "test:server": "jest --colors --selectProjects server --",
     "postinstall": "prisma generate",
-    "dev": "npm run copy:migrations && node ./esbuild.js dev",
+    "dev": "npm run copy:migrations && nodemon",
     "start": "NODE_ENV=production node index.js",
     "lint": "next lint",
     "lint:fix": "next lint --fix",
@@ -30,7 +30,7 @@
   },
   "dependencies": {
     "@hookform/resolvers": "^2.9.10",
-    "@prisma/client": "^4.8.0",
+    "@prisma/client": "^4.11.0",
     "@runtipi/postgres-migrations": "^5.3.0",
     "@tabler/core": "1.0.0-beta16",
     "@tabler/icons": "^1.109.0",
@@ -111,8 +111,9 @@
     "jest-environment-jsdom": "^29.3.1",
     "msw": "^1.0.0",
     "next-router-mock": "^0.8.0",
+    "nodemon": "^2.0.21",
     "prettier": "^2.8.4",
-    "prisma": "^4.10.1",
+    "prisma": "^4.11.0",
     "ts-jest": "^29.0.3",
     "ts-node": "^10.9.1",
     "typescript": "4.9.4",