diff --git a/Dockerfile b/Dockerfile index 5992f13..0fb70ef 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM node:16.14.2-alpine as client-builder +FROM node:22.2.0-alpine as client-builder COPY picture-gallery-client/package*.json /usr/src/app/picture-gallery-client/ WORKDIR /usr/src/app/picture-gallery-client @@ -10,9 +10,11 @@ RUN mkdir built && \ mv build built && \ mv package.minimize.docker.json built/package.json && \ cp package-lock.json built && \ + cp .env.example built && \ + cp .env built && \ npm ci --prefix ./built --only=production -FROM node:16.14.2-alpine as server-builder +FROM node:22.2.0-alpine as server-builder COPY picture-gallery-server/package*.json /usr/src/app/picture-gallery-server/ WORKDIR /usr/src/app/picture-gallery-server @@ -23,7 +25,7 @@ RUN npm run server:build RUN mkdir built && \ mv dist node_modules built -FROM node:16.14.2-alpine +FROM node:22.2.0-alpine ENV NODE_ENV=production diff --git a/README.md b/README.md index c0e0dc9..aa67c4d 100644 --- a/README.md +++ b/README.md @@ -2,6 +2,10 @@ ## Getting Started +### Information + +Folders should only contain images and folders. Folders should not contain any other files. + ### Docker ```shell diff --git a/picture-gallery-client/package.json b/picture-gallery-client/package.json index f1a72bb..9a5a644 100644 --- a/picture-gallery-client/package.json +++ b/picture-gallery-client/package.json @@ -9,7 +9,7 @@ "format:check": "prettier --check \"**/*.+(ts|tsx)\"", "lint": "eslint src/**", "lint:fix": "eslint --fix src/**", - "client:build": "vite build && npm run set-environment", + "client:build": "vite build", "client:run": "npm run client:build && npm run client:start", "client:start": "vite", "set-environment": "npx import-meta-env -x .env.example", @@ -27,6 +27,9 @@ "@types/node": "^22.2.0", "@types/react": "^18.3.3", "@types/react-dom": "^18.3.0", + "@typescript-eslint/eslint-plugin": "8.0.1", + "@typescript-eslint/parser": "8.0.1", + "@vitejs/plugin-react": "^4.3.1", "cross-env": "^7.0.3", "dotenv": "^16.4.5", "eslint": "8.57.0", @@ -41,22 +44,19 @@ "react-dom": "^18.3.1", "react-router-dom": "^6.26.0", "typescript": "^5.5.4", + "vite": "^5.4.0", + "vite-plugin-eslint": "^1.8.1", + "vite-tsconfig-paths": "^5.0.1", "web-vitals": "^4.2.3", "yet-another-react-lightbox": "^3.21.3" }, "devDependencies": { "@testing-library/react": "^16.0.0", "@testing-library/user-event": "^14.5.2", - "@typescript-eslint/eslint-plugin": "8.0.1", - "@typescript-eslint/parser": "8.0.1", - "@vitejs/plugin-react": "^4.3.1", "@vitest/coverage-v8": "^2.0.5", "jsdom": "^24.1.1", "prettier": "^3.3.3", "ts-node": "^10.9.2", - "vite": "^5.4.0", - "vite-plugin-eslint": "^1.8.1", - "vite-tsconfig-paths": "^5.0.1", "vitest": "^2.0.5" }, "eslintConfig": {